diff --git a/FAQ.md b/FAQ.md index a02f22629..1cf0ea139 100644 --- a/FAQ.md +++ b/FAQ.md @@ -1,27 +1,43 @@ # FAQ + +## Questions + +- [What is pokecrystal11.gbc?](#what-is-pokecrystal11gbc) +- [Can't build ROM; "ERROR: `UNION` already defined"](#cant-build-rom-error-union-already-defined) +- [Can't build ROM; "Segmentation fault" from `rgbgfx`](#cant-build-rom-segmentation-fault-from-rgbgfx) +- [Can't build ROM; "Section is too big" or "Unable to place section in bank"](#cant-build-rom-section-is-too-big-or-unable-to-place-section-in-bank) +- [How do I edit maps?](#how-do-i-edit-maps) +- [I need more help!](#i-need-more-help) + + ## What is pokecrystal11.gbc? Version 1.1 of Pokémon Crystal, which fixed some issues with the initial international release. `make crystal11` defines `CRYSTAL11` so the assembly builds the changed version. + ## Can't build ROM; "ERROR: `UNION` already defined" Download [**rgbds 0.3.3**](rgbds). Earlier versions will not work. + ## Can't build ROM; "Segmentation fault" from `rgbgfx` If you are using 64-bit Windows, download [**64-bit Cygwin**](cygwin) and [**64-bit rgbds**](rgbds). + ## Can't build ROM; "Section is too big" or "Unable to place section in bank" If you have not changed any of the asm, make sure you have the latest version of pokecrystal and the correct version of rgbds (see [INSTALL.md](INSTALL.md)). If you added or changed any code, it has to fit in the **memory banks**. The 2MB ROM is divided into 128 banks of 4KB each, numbered $00 to $7F. The linkerscript **pokecrystal.link** lists which **`SECTION`**s go in which banks. Try moving some code into a new section. + ## How do I edit maps? For `asm` scripts, read [docs/map_scripts.md](docs/map_scripts.md). For `blk` layouts, try [crowdmap](crowdmap) or [Polished Map](polished-map). + ## I need more help! Try asking on IRC or Discord (see [README.md](README.md)). diff --git a/Makefile b/Makefile index d3158c341..4a4c640f9 100644 --- a/Makefile +++ b/Makefile @@ -17,20 +17,20 @@ RGBLINK := rgblink crystal_obj := \ -wram.o \ -main.o \ -lib/mobile/main.o \ -home.o \ audio.o \ +home.o \ +main.o \ maps.o \ -engine/events.o \ +wram.o \ +data/pokemon/dex_entries.o \ +data/pokemon/egg_moves.o \ +data/pokemon/evos_attacks.o \ engine/credits.o \ -data/egg_moves.o \ -data/evos_attacks.o \ -data/pokedex/entries.o \ -misc/crystal_misc.o \ -text/common_text.o \ -gfx/pics.o +engine/events.o \ +gfx/pics.o \ +gfx/sprites.o \ +lib/mobile/main.o \ +text/common_text.o crystal11_obj := $(crystal_obj:.o=11.o) @@ -197,15 +197,17 @@ gfx/trainer_card/kris_card.2bpp: rgbgfx += -h gfx/battle/dude.2bpp: rgbgfx += -h +gfx/font/unused_bold_font.1bpp: tools/gfx += --trim-whitespace + gfx/pokegear/pokegear.2bpp: rgbgfx += -x2 gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace -gfx/unknown/ascii_font.2bpp: tools/gfx += --trim-whitespace -gfx/unknown/bold_font.1bpp: tools/gfx += --trim-whitespace -gfx/unknown/egg_animated.2bpp: tools/gfx += --trim-whitespace -gfx/unknown/egg_animated_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip -gfx/unknown/mobile_splash.2bpp: tools/gfx += --remove-duplicates --remove-xflip -gfx/unknown/pichu_animated.2bpp: tools/gfx += --trim-whitespace +gfx/mobile/ascii_font.2bpp: tools/gfx += --trim-whitespace +gfx/mobile/electro_ball.2bpp: tools/gfx += --trim-whitespace +gfx/mobile/electro_ball_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/mobile/mobile_splash.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/mobile/pichu_animated.2bpp: tools/gfx += --trim-whitespace + gfx/unknown/unknown_egg.2bpp: rgbgfx += -h diff --git a/audio.asm b/audio.asm index 452fed76d..c358e4d9b 100644 --- a/audio.asm +++ b/audio.asm @@ -4,7 +4,7 @@ INCLUDE "includes.asm" SECTION "Audio", ROMX INCLUDE "audio/engine.asm" -INCLUDE "trainers/encounter_music.asm" +INCLUDE "data/trainers/encounter_music.asm" INCLUDE "audio/music_pointers.asm" INCLUDE "audio/music/nothing.asm" INCLUDE "audio/cry_pointers.asm" @@ -157,6 +157,6 @@ INCLUDE "audio/sfx_crystal.asm" SECTION "Cries", ROMX -CryHeaders:: INCLUDE "audio/cry_headers.asm" +INCLUDE "data/pokemon/cry_headers.asm" INCLUDE "audio/cries.asm" diff --git a/audio/engine.asm b/audio/engine.asm index 4fd618940..cd68bc96d 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -245,7 +245,7 @@ UpdateChannels: ; e8125 .Channel1: ld a, [Danger] - bit 7, a + bit DANGER_ON_F, a ret nz .Channel5: ld hl, Channel1NoteFlags - Channel1 @@ -537,9 +537,9 @@ _CheckSFX: ; e82e7 PlayDanger: ; e8307 ld a, [Danger] - bit 7, a + bit DANGER_ON_F, a ret z - and $7f + and $ff - (1 << DANGER_ON_F) ld d, a call _CheckSFX jr c, .asm_e8335 @@ -573,7 +573,7 @@ PlayDanger: ; e8307 jr c, .asm_e833c xor a .asm_e833c - or $80 + or 1 << DANGER_ON_F ld [Danger], a ; is hw ch1 on? ld a, [SoundOutput] @@ -632,9 +632,9 @@ FadeMusic: ; e8358 ld [MusicFadeCount], a ; get SO1 volume ld a, [Volume] - and $7 + and VOLUME_SO1_LEVEL ; which way are we fading? - bit 7, d + bit MUSIC_FADE_IN_F, d jr nz, .fadein ; fading out and a @@ -648,7 +648,7 @@ FadeMusic: ; e8358 ld [Volume], a ; did we just get on a bike? ld a, [PlayerState] - cp $1 ; bicycle + cp PLAYER_BIKE jr z, .bicycle push bc ; restart sound @@ -688,7 +688,7 @@ FadeMusic: ; e8358 pop bc ; fade in ld hl, MusicFade - set 7, [hl] + set MUSIC_FADE_IN_F, [hl] ret .fadein @@ -2882,9 +2882,9 @@ LoadMusicByte:: ; e8d76 ; e8d80 -INCLUDE "data/audio/notes.asm" +INCLUDE "audio/notes.asm" -INCLUDE "data/audio/wave_samples.asm" +INCLUDE "audio/wave_samples.asm" INCLUDE "audio/drumkits.asm" @@ -2976,7 +2976,7 @@ PlayTrainerEncounterMusic:: ; e900a ld [MusicFade], a ; play nothing for one frame push de - ld de, 0 ; id: Music_Nothing + ld de, MUSIC_NONE call PlayMusic call DelayFrame ; play new song diff --git a/data/audio/notes.asm b/audio/notes.asm similarity index 100% rename from data/audio/notes.asm rename to audio/notes.asm diff --git a/data/audio/wave_samples.asm b/audio/wave_samples.asm similarity index 100% rename from data/audio/wave_samples.asm rename to audio/wave_samples.asm diff --git a/battle/core.asm b/battle/core.asm index bc8a37725..438c08f08 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -820,41 +820,7 @@ TryEnemyFlee: ; 3c543 ret ; 3c59a -FleeMons: - -SometimesFleeMons: ; 3c59a - db MAGNEMITE - db GRIMER - db TANGELA - db MR__MIME - db EEVEE - db PORYGON - db DRATINI - db DRAGONAIR - db TOGETIC - db UMBREON - db UNOWN - db SNUBBULL - db HERACROSS - db -1 - -OftenFleeMons: ; 3c5a8 - db CUBONE - db ARTICUNO - db ZAPDOS - db MOLTRES - db QUAGSIRE - db DELIBIRD - db PHANPY - db TEDDIURSA - db -1 - -AlwaysFleeMons: ; 3c5b1 - db RAIKOU - db ENTEI -; db SUICUNE - db -1 -; 3c5b4 +INCLUDE "data/battle/flee_mons.asm" CompareMovePriority: ; 3c5b4 ; Compare the priority of the player and enemy's moves. @@ -876,7 +842,7 @@ GetMovePriority: ; 3c5c5 ld b, a - ; Vital throw goes last. + ; Vital Throw goes last. cp VITAL_THROW ld a, 0 ret z @@ -4454,7 +4420,7 @@ HandleHealingItems: ; 3dcf9 HandleHPHealingItem: ; 3dd2f callab GetOpponentItem ld a, b - cp $1 + cp HELD_BERRY ret nz ld de, EnemyMonHP + 1 ld hl, EnemyMonMaxHP @@ -4856,12 +4822,12 @@ CheckDanger: ; 3df9e .no_danger ld hl, Danger - res 7, [hl] + res DANGER_ON_F, [hl] jr .done .danger ld hl, Danger - set 7, [hl] + set DANGER_ON_F, [hl] .done ret diff --git a/battle/effect_command_pointers.asm b/battle/effect_command_pointers.asm index 60c658dfc..bcd666c91 100644 --- a/battle/effect_command_pointers.asm +++ b/battle/effect_command_pointers.asm @@ -1,7 +1,7 @@ dw 0 ; padding BattleCommandPointers: ; 3fd28 -; entries correspond to constants/effect_command_constants.asm +; entries correspond to macros/scripts/effect_commands.asm dw BattleCommand_CheckTurn ; 34084 dw BattleCommand_CheckObedience ; 343db dw BattleCommand_UsedMoveText ; 34541 diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index bcebbb6ca..57e4c574f 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -3191,6 +3191,8 @@ BattleCommand_BeatUp: ; 35461 ld a, [wd002] ld c, a ld a, [CurBattleMon] + ; BUG: this can desynchronize link battles + ; Change "cp [hl]" to "cp c" to fix cp [hl] ld hl, BattleMonStatus jr z, .active_mon @@ -9763,6 +9765,7 @@ BattleCommand_ThunderAccuracy: ; 37d94 CheckHiddenOpponent: ; 37daa +; BUG: This routine should account for Lock-On and Mind Reader. ld a, BATTLE_VARS_SUBSTATUS3_OPP call GetBattleVar and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND @@ -9806,7 +9809,7 @@ GetItemHeldEffect: ; 37dd0 ret z push hl - ld hl, ItemAttributes + 2 + ld hl, ItemAttributes + ITEMATTR_EFFECT dec a ld c, a ld b, 0 diff --git a/battle/magikarp_length.asm b/battle/magikarp_length.asm deleted file mode 100644 index 794823f63..000000000 --- a/battle/magikarp_length.asm +++ /dev/null @@ -1,214 +0,0 @@ -CalcMagikarpLength: ; fbbfc -; Return Magikarp's length (in mm) at wMagikarpLength (big endian). -; -; input: -; de: EnemyMonDVs -; bc: PlayerID - -; This function is poorly commented. - -; In short, it generates a value between 190 and 1786 using -; a Magikarp's DVs and its trainer ID. This value is further -; filtered in LoadEnemyMon to make longer Magikarp even rarer. - -; The value is generated from a lookup table. -; The index is determined by the dv xored with the player's trainer id. - -; bc = rrc(dv[0]) ++ rrc(dv[1]) ^ rrc(id) - -; if bc < 10: [wMagikarpLength] = c + 190 -; if bc >= $ff00: [wMagikarpLength] = c + 1370 -; else: [wMagikarpLength] = z * 100 + (bc - x) / y - -; X, Y, and Z depend on the value of b as follows: - -; if b = 0: x = 310, y = 2, z = 3 -; if b = 1: x = 710, y = 4, z = 4 -; if b = 2-9: x = 2710, y = 20, z = 5 -; if b = 10-29: x = 7710, y = 50, z = 6 -; if b = 30-68: x = 17710, y = 100, z = 7 -; if b = 69-126: x = 32710, y = 150, z = 8 -; if b = 127-185: x = 47710, y = 150, z = 9 -; if b = 186-224: x = 57710, y = 100, z = 10 -; if b = 225-243: x = 62710, y = 50, z = 11 -; if b = 244-251: x = 64710, y = 20, z = 12 -; if b = 252-253: x = 65210, y = 5, z = 13 -; if b = 254: x = 65410, y = 2, z = 14 - - - ; bc = rrc(dv[0]) ++ rrc(dv[1]) ^ rrc(id) - - ; id - ld h, b - ld l, c - ld a, [hli] - ld b, a - ld c, [hl] - rrc b - rrc c - - ; dv - ld a, [de] - inc de - rrca - rrca - xor b - ld b, a - - ld a, [de] - rrca - rrca - xor c - ld c, a - - ; if bc < 10: - ; de = bc + 190 - ; break - - ld a, b - and a - jr nz, .no - ld a, c - cp 10 - jr nc, .no - - ld hl, 190 - add hl, bc - ld d, h - ld e, l - jr .done - -.no - - ld hl, .Lengths - ld a, 2 - ld [wd265], a - -.read - ld a, [hli] - ld e, a - ld a, [hli] - ld d, a - call .BCLessThanDE - jr nc, .next - - ; c = (bc - de) / [hl] - call .BCMinusDE - ld a, b - ld [hDividend + 0], a - ld a, c - ld [hDividend + 1], a - ld a, [hl] - ld [hDivisor], a - ld b, 2 - call Divide - ld a, [hQuotient + 2] - ld c, a - - ; de = c + 100 * (2 + i) - xor a - ld [hMultiplicand + 0], a - ld [hMultiplicand + 1], a - ld a, 100 - ld [hMultiplicand + 2], a - ld a, [wd265] - ld [hMultiplier], a - call Multiply - ld b, 0 - ld a, [hProduct + 3] - add c - ld e, a - ld a, [hProduct + 2] - adc b - ld d, a - jr .done - -.next - inc hl ; align to next triplet - ld a, [wd265] - inc a - ld [wd265], a - cp 16 - jr c, .read - - call .BCMinusDE - ld hl, 1600 - add hl, bc - ld d, h - ld e, l - -.done - ; hl = de * 10 - ld h, d - ld l, e - add hl, hl - add hl, hl - add hl, de - add hl, hl - - ; hl = hl / 254 - ld de, -254 - ld a, -1 -.div_254 - inc a - add hl, de - jr c, .div_254 - - ; d, e = hl / 12, hl % 12 - ld d, 0 -.mod_12 - cp 12 - jr c, .ok - sub 12 - inc d - jr .mod_12 -.ok - ld e, a - - ld hl, wMagikarpLength - ld [hl], d - inc hl - ld [hl], e - ret -; fbc9a - -.BCLessThanDE: ; fbc9a -; Intention: Return bc < de. -; Reality: Return b < d. - ld a, b - cp d - ret c - ret nc ; whoops - ld a, c - cp e - ret -; fbca1 - -.BCMinusDE: ; fbca1 -; bc -= de - ld a, c - sub e - ld c, a - ld a, b - sbc d - ld b, a - ret -; fbca8 - -.Lengths: ; fbca8 -; ????, divisor - dwb 110, 1 - 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/battle/moves/move_descriptions.asm b/battle/moves/move_descriptions.asm index df31fd38a..19659b32a 100644 --- a/battle/moves/move_descriptions.asm +++ b/battle/moves/move_descriptions.asm @@ -1,4 +1,5 @@ -; MoveDescriptions: ; 2cb52 +MoveDescriptions:: ; 2cb52 +; entries correspond to move ids (see constants/move_constants.asm) dw PoundDescription dw KarateChopDescription dw DoubleslapDescription diff --git a/battle/moves/move_effects.asm b/battle/moves/move_effects.asm index 73bc3cbec..c56ff2560 100644 --- a/battle/moves/move_effects.asm +++ b/battle/moves/move_effects.asm @@ -1,3 +1,5 @@ +MoveEffects: ; 2732e + NormalHit: checkobedience usedmovetext @@ -571,7 +573,7 @@ DefenseDownHit: supereffectivetext checkdestinybond buildopponentrage - effectchance + effectchance ; bug: duplicate effectchance shouldn't be here defensedown statdownmessage endmove diff --git a/battle/moves/move_effects_pointers.asm b/battle/moves/move_effects_pointers.asm index d15beedb7..a12092881 100644 --- a/battle/moves/move_effects_pointers.asm +++ b/battle/moves/move_effects_pointers.asm @@ -1,3 +1,4 @@ +MoveEffectsPointers: ; 271f4 ; entries correspond to EFFECT_* constants dw NormalHit dw DoSleep diff --git a/battle/moves/moves.asm b/battle/moves/moves.asm index 43ba6f10d..b576fbaff 100644 --- a/battle/moves/moves.asm +++ b/battle/moves/moves.asm @@ -1,4 +1,3 @@ -Moves: ; 41afb ; Characteristics of each move. move: MACRO @@ -11,6 +10,8 @@ move: MACRO db \7 percent ; effect chance ENDM +Moves: ; 41afb +; entries correspond to constants/move_constants.asm move POUND, EFFECT_NORMAL_HIT, 40, NORMAL, 100, 35, 0 move KARATE_CHOP, EFFECT_NORMAL_HIT, 50, FIGHTING, 100, 25, 0 move DOUBLESLAP, EFFECT_MULTI_HIT, 15, NORMAL, 85, 10, 0 diff --git a/battle/objects/data.asm b/battle/objects/data.asm index fca986f68..8117d8495 100755 --- a/battle/objects/data.asm +++ b/battle/objects/data.asm @@ -1,4 +1,6 @@ -BattleAnimObjects: ; ccb56 +ABSOLUTE_X EQU $00 +RELATIVE_X EQU $01 + battleanimobj: MACRO db \1 ; flags ; bit 7: priority @@ -14,572 +16,194 @@ battleanimobj: MACRO db \6 ; tile offset endm -ABSOLUTE_X EQU $00 -RELATIVE_X EQU $01 - - -; ANIM_OBJ_00 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_00, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 - -; ANIM_OBJ_01 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_01, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 - -; ANIM_OBJ_02 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_02, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 - -; ANIM_OBJ_03 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_00, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 - -; ANIM_OBJ_04 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_01, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 - -; ANIM_OBJ_05 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_02, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 - -; ANIM_OBJ_06 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_03, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 - -; ANIM_OBJ_07 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_04, BATTLEANIMFUNC_1B, PAL_BATTLE_OB_GRAY, $01 - -; ANIM_OBJ_08 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_05, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 - -; ANIM_OBJ_09 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_06, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 - -; ANIM_OBJ_0A - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_07, BATTLEANIMFUNC_09, PAL_BATTLE_OB_GRAY, $01 - -; ANIM_OBJ_0B - battleanimobj RELATIVE_X, $aa, BATTLEANIMFRAMESET_10, BATTLEANIMFUNC_10, PAL_BATTLE_OB_RED, $03 - -; ANIM_OBJ_0C - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_0E, BATTLEANIMFUNC_04, PAL_BATTLE_OB_RED, $03 - -; ANIM_OBJ_0D - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_03, PAL_BATTLE_OB_RED, $03 - -; ANIM_OBJ_0E - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_10, BATTLEANIMFUNC_08, PAL_BATTLE_OB_RED, $03 - -; ANIM_OBJ_0F - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_0A, PAL_BATTLE_OB_RED, $03 - -; ANIM_OBJ_BURNED - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_11, BATTLEANIMFUNC_03, PAL_BATTLE_OB_RED, $03 - -; ANIM_OBJ_BLIZZARD - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_12, BATTLEANIMFUNC_08, PAL_BATTLE_OB_BLUE, $0a - -; ANIM_OBJ_12 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_13, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $0a - -; ANIM_OBJ_ICE_BEAM - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_14, BATTLEANIMFUNC_01, PAL_BATTLE_OB_BLUE, $0a - -; ANIM_OBJ_RAZOR_LEAF - battleanimobj RELATIVE_X | X_FLIP, $78, BATTLEANIMFRAMESET_16, BATTLEANIMFUNC_RAZOR_LEAF, PAL_BATTLE_OB_GREEN, $06 - -; ANIM_OBJ_POKE_BALL - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_09, BATTLEANIMFUNC_12, PAL_BATTLE_OB_RED, $0b - -; ANIM_OBJ_POKE_BALL_BLOCKED - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_09, BATTLEANIMFUNC_13, PAL_BATTLE_OB_RED, $0b - -; ANIM_OBJ_17 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_18, BATTLEANIMFUNC_00, PAL_BATTLE_OB_RED, $08 - -; ANIM_OBJ_18 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_18, BATTLEANIMFUNC_00, PAL_BATTLE_OB_RED, $08 - -; ANIM_OBJ_19 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_1D, BATTLEANIMFUNC_06, PAL_BATTLE_OB_GRAY, $0c - -; ANIM_OBJ_1A - battleanimobj RELATIVE_X, $b4, BATTLEANIMFRAMESET_1F, BATTLEANIMFUNC_38, PAL_BATTLE_OB_GRAY, $0c - -; ANIM_OBJ_1B - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_08, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $07 - -; ANIM_OBJ_BALL_POOF - battleanimobj RELATIVE_X, $a0, BATTLEANIMFRAMESET_08, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $07 - -; ANIM_OBJ_1D - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_07, PAL_BATTLE_OB_BROWN, $09 - -; ANIM_OBJ_1E - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_1A, BATTLEANIMFUNC_07, PAL_BATTLE_OB_BROWN, $09 - -; ANIM_OBJ_1F - battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_1B, BATTLEANIMFUNC_36, PAL_BATTLE_OB_BROWN, $09 - -; ANIM_OBJ_20 - battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_84, BATTLEANIMFUNC_36, PAL_BATTLE_OB_BLUE, $21 - -; ANIM_OBJ_BUBBLE - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_0C, PAL_BATTLE_OB_BLUE, $0d - -; ANIM_OBJ_22 - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_23, BATTLEANIMFUNC_0D, PAL_BATTLE_OB_BLUE, $0d - -; ANIM_OBJ_23 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_0E, PAL_BATTLE_OB_GRAY, $0e - -; ANIM_OBJ_24 - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $80, BATTLEANIMFRAMESET_27, BATTLEANIMFUNC_0F, PAL_BATTLE_OB_BLUE, $04 - -; ANIM_OBJ_25 - battleanimobj RELATIVE_X, $b4, BATTLEANIMFRAMESET_2A, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $04 - -; ANIM_OBJ_26 - battleanimobj RELATIVE_X, $40, BATTLEANIMFRAMESET_2B, BATTLEANIMFUNC_11, PAL_BATTLE_OB_GREEN, $0f - -; ANIM_OBJ_27 - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $98, BATTLEANIMFRAMESET_2C, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $10 - -; ANIM_OBJ_28 - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $98, BATTLEANIMFRAMESET_2D, BATTLEANIMFUNC_09, PAL_BATTLE_OB_YELLOW, $10 - -; ANIM_OBJ_ICE_BUILDUP - battleanimobj RELATIVE_X, $b8, BATTLEANIMFRAMESET_2E, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $0a - -; ANIM_OBJ_FROZEN - battleanimobj RELATIVE_X, $b8, BATTLEANIMFRAMESET_2F, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $0a - -; ANIM_OBJ_MASTER_BALL_SPARKLE - battleanimobj RELATIVE_X, $b8, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_14, PAL_BATTLE_OB_BROWN, $11 - -; ANIM_OBJ_2C - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_14, PAL_BATTLE_OB_YELLOW, $0d - -; ANIM_OBJ_2D - battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_31, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 - -; ANIM_OBJ_2E - battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_32, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 - -; ANIM_OBJ_2F - battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_33, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 - -; ANIM_OBJ_30 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_34, BATTLEANIMFUNC_15, PAL_BATTLE_OB_YELLOW, $05 - -; ANIM_OBJ_31 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_36, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 - -; ANIM_OBJ_LIGHTNING_BOLT - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_37, BATTLEANIMFUNC_03, PAL_BATTLE_OB_GRAY, $08 - -; ANIM_OBJ_33 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_38, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 - -; ANIM_OBJ_34 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_39, BATTLEANIMFUNC_03, PAL_BATTLE_OB_GRAY, $08 - -; ANIM_OBJ_35 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_3A, BATTLEANIMFUNC_16, PAL_BATTLE_OB_GRAY, $02 - -; ANIM_OBJ_36 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_3C, BATTLEANIMFUNC_17, PAL_BATTLE_OB_GRAY, $02 - -; ANIM_OBJ_37 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_3E, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 - -; ANIM_OBJ_38 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_3F, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 - -; ANIM_OBJ_39 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_40, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 - -; ANIM_OBJ_3A - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_41, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 - -; ANIM_OBJ_3B - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_42, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 - -; ANIM_OBJ_3C - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_43, BATTLEANIMFUNC_18, PAL_BATTLE_OB_GREEN, $12 - -; ANIM_OBJ_3D - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_44, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GREEN, $12 - -; ANIM_OBJ_GUST - battleanimobj RELATIVE_X | X_FLIP, $b8, BATTLEANIMFRAMESET_45, BATTLEANIMFUNC_19, PAL_BATTLE_OB_GRAY, $13 - -; ANIM_OBJ_3F - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_46, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $14 - -; ANIM_OBJ_40 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_47, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $14 - -; ANIM_OBJ_41 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_48, BATTLEANIMFUNC_1A, PAL_BATTLE_OB_GRAY, $14 - -; ANIM_OBJ_42 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_49, BATTLEANIMFUNC_1A, PAL_BATTLE_OB_GRAY, $14 - -; ANIM_OBJ_43 - battleanimobj RELATIVE_X | X_FLIP, $98, BATTLEANIMFRAMESET_4A, BATTLEANIMFUNC_01, PAL_BATTLE_OB_GRAY, $14 - -; ANIM_OBJ_44 - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_4B, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $11 - -; ANIM_OBJ_ABSORB - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_4C, BATTLEANIMFUNC_1C, PAL_BATTLE_OB_GREEN, $12 - -; ANIM_OBJ_46 - battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_4D, BATTLEANIMFUNC_1D, PAL_BATTLE_OB_GRAY, $15 - -; ANIM_OBJ_47 - battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_51, BATTLEANIMFUNC_1E, PAL_BATTLE_OB_YELLOW, $11 - -; ANIM_OBJ_48 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_52, BATTLEANIMFUNC_1F, PAL_BATTLE_OB_GREEN, $16 - -; ANIM_OBJ_49 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_54, BATTLEANIMFUNC_1F, PAL_BATTLE_OB_GREEN, $16 - -; ANIM_OBJ_LEECH_SEED - battleanimobj RELATIVE_X | X_FLIP, $68, BATTLEANIMFRAMESET_56, BATTLEANIMFUNC_LEECH_SEED, PAL_BATTLE_OB_GREEN, $06 - -; ANIM_OBJ_4B - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_59, BATTLEANIMFUNC_21, PAL_BATTLE_OB_GRAY, $0e - -; ANIM_OBJ_4C - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_5C, BATTLEANIMFUNC_02, PAL_BATTLE_OB_GRAY, $17 - -; ANIM_OBJ_4D - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_5D, BATTLEANIMFUNC_22, PAL_BATTLE_OB_YELLOW, $11 - -; ANIM_OBJ_4E - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $88, BATTLEANIMFRAMESET_5F, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $10 - -; ANIM_OBJ_4F - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $88, BATTLEANIMFRAMESET_2D, BATTLEANIMFUNC_09, PAL_BATTLE_OB_YELLOW, $10 - -; ANIM_OBJ_50 - battleanimobj RELATIVE_X | X_FLIP, $88, BATTLEANIMFRAMESET_60, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $18 - -; ANIM_OBJ_51 - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_60, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $18 - -; ANIM_OBJ_CHICK - battleanimobj RELATIVE_X | X_FLIP, $50, BATTLEANIMFRAMESET_61, BATTLEANIMFUNC_23, PAL_BATTLE_OB_YELLOW, $19 - -; ANIM_OBJ_53 - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_63, BATTLEANIMFUNC_24, PAL_BATTLE_OB_GRAY, $19 - -; ANIM_OBJ_54 - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_66, BATTLEANIMFUNC_25, PAL_BATTLE_OB_GRAY, $19 - -; ANIM_OBJ_SKULL - battleanimobj RELATIVE_X, $50, BATTLEANIMFRAMESET_1C, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $0c - -; ANIM_OBJ_56 - battleanimobj RELATIVE_X | X_FLIP, $a8, BATTLEANIMFRAMESET_67, BATTLEANIMFUNC_26, PAL_BATTLE_OB_BROWN, $1a - -; ANIM_OBJ_57 - battleanimobj RELATIVE_X | X_FLIP, $a8, BATTLEANIMFRAMESET_68, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BROWN, $1a - -; ANIM_OBJ_58 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_69, BATTLEANIMFUNC_01, PAL_BATTLE_OB_GRAY, $1a - -; ANIM_OBJ_PARALYZED - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_6D, BATTLEANIMFUNC_28, PAL_BATTLE_OB_YELLOW, $19 - -; ANIM_OBJ_5A - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_6A, BATTLEANIMFUNC_27, PAL_BATTLE_OB_GRAY, $1b - -; ANIM_OBJ_HAZE - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_SPRIAL_DESCENT, PAL_BATTLE_OB_GRAY, $1c - -; ANIM_OBJ_MIST - battleanimobj RELATIVE_X | X_FLIP, $48, BATTLEANIMFRAMESET_70, BATTLEANIMFUNC_SPRIAL_DESCENT, PAL_BATTLE_OB_GRAY, $1c - -; ANIM_OBJ_SMOG - battleanimobj RELATIVE_X | X_FLIP, $48, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_SPRIAL_DESCENT, PAL_BATTLE_OB_GRAY, $1c - -; ANIM_OBJ_POISON_GAS - battleanimobj RELATIVE_X | X_FLIP, $78, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_POISON_GAS, PAL_BATTLE_OB_GRAY, $1c - -; ANIM_OBJ_HORN - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $90, BATTLEANIMFRAMESET_71, BATTLEANIMFUNC_HORN, PAL_BATTLE_OB_GRAY, $1d - -; ANIM_OBJ_60 - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $90, BATTLEANIMFRAMESET_72, BATTLEANIMFUNC_2C, PAL_BATTLE_OB_GRAY, $1d - -; ANIM_OBJ_61 - battleanimobj RELATIVE_X, $48, BATTLEANIMFRAMESET_73, BATTLEANIMFUNC_2D, PAL_BATTLE_OB_RED, $1e - -; ANIM_OBJ_62 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_06, PAL_BATTLE_OB_GRAY, $15 - -; ANIM_OBJ_63 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_75, BATTLEANIMFUNC_2E, PAL_BATTLE_OB_BROWN, $19 - -; ANIM_OBJ_64 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_4A, BATTLEANIMFUNC_02, PAL_BATTLE_OB_GRAY, $14 - -; ANIM_OBJ_65 - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_2F, PAL_BATTLE_OB_GRAY, $11 - -; ANIM_OBJ_66 - battleanimobj RELATIVE_X, $78, BATTLEANIMFRAMESET_76, BATTLEANIMFUNC_POISON_GAS, PAL_BATTLE_OB_RED, $23 - -; ANIM_OBJ_67 - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_30, PAL_BATTLE_OB_GRAY, $1f - -; ANIM_OBJ_68 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_02, PAL_BATTLE_OB_GRAY, $1f - -; ANIM_OBJ_69 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $1f - -; ANIM_OBJ_6A - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_78, BATTLEANIMFUNC_08, PAL_BATTLE_OB_YELLOW, $23 - -; ANIM_OBJ_6B - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_79, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $1f - -; ANIM_OBJ_6C - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_7A, BATTLEANIMFUNC_31, PAL_BATTLE_OB_YELLOW, $11 - -; ANIM_OBJ_6D - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_7A, BATTLEANIMFUNC_31, PAL_BATTLE_OB_YELLOW, $11 - -; ANIM_OBJ_SKY_ATTACK_FEAROW - battleanimobj RELATIVE_X | X_FLIP, $88, BATTLEANIMFRAMESET_7B, BATTLEANIMFUNC_32, PAL_BATTLE_OB_GRAY, $20 - -; ANIM_OBJ_LICK - battleanimobj RELATIVE_X | X_FLIP, $98, BATTLEANIMFRAMESET_7C, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $04 - -; ANIM_OBJ_WITHDRAW - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_7D, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $18 - -; ANIM_OBJ_71 - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_2F, PAL_BATTLE_OB_BLUE, $0d - -; ANIM_OBJ_72 - battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_7E, BATTLEANIMFUNC_33, PAL_BATTLE_OB_YELLOW, $12 - -; ANIM_OBJ_73 - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_7F, BATTLEANIMFUNC_2F, PAL_BATTLE_OB_GRAY, $08 - -; ANIM_OBJ_74 - battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_34, PAL_BATTLE_OB_GRAY, $1c - -; ANIM_OBJ_75 - battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_35, PAL_BATTLE_OB_GRAY, $15 - -; ANIM_OBJ_76 - battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_80, BATTLEANIMFUNC_33, PAL_BATTLE_OB_GRAY, $14 - -; ANIM_OBJ_77 - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_81, BATTLEANIMFUNC_37, PAL_BATTLE_OB_GRAY, $11 - -; ANIM_OBJ_78 - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_85, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $22 - -; ANIM_OBJ_79 - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_86, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $22 - -; ANIM_OBJ_7A - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_87, BATTLEANIMFUNC_39, PAL_BATTLE_OB_GRAY, $1f - -; ANIM_OBJ_7B - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_3A, PAL_BATTLE_OB_YELLOW, $11 - -; ANIM_OBJ_7C - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_34, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 - -; ANIM_OBJ_7D - battleanimobj RELATIVE_X | X_FLIP | BEHIND_BG, $88, BATTLEANIMFRAMESET_88, BATTLEANIMFUNC_3B, PAL_BATTLE_OB_BLUE, $13 - -; ANIM_OBJ_HEART - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_76, BATTLEANIMFUNC_25, PAL_BATTLE_OB_RED, $23 - -; ANIM_OBJ_7F - battleanimobj RELATIVE_X, $98, BATTLEANIMFRAMESET_10, BATTLEANIMFUNC_34, PAL_BATTLE_OB_RED, $03 - -; ANIM_OBJ_80 - battleanimobj RELATIVE_X, $a8, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_3C, PAL_BATTLE_OB_RED, $03 - -; ANIM_OBJ_COTTON_SPORE - battleanimobj RELATIVE_X | X_FLIP, $68, BATTLEANIMFRAMESET_89, BATTLEANIMFUNC_SPRIAL_DESCENT, PAL_BATTLE_OB_GRAY, $1f - -; ANIM_OBJ_82 - battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_8A, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $1f - -; ANIM_OBJ_83 - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_8C, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $1f - -; ANIM_OBJ_84 - battleanimobj RELATIVE_X | X_FLIP, $50, BATTLEANIMFRAMESET_8D, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $1f - -; ANIM_OBJ_85 - battleanimobj RELATIVE_X, $40, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_40, PAL_BATTLE_OB_GRAY, $0e - -; ANIM_OBJ_86 - battleanimobj RELATIVE_X | X_FLIP, $a8, BATTLEANIMFRAMESET_8E, BATTLEANIMFUNC_41, PAL_BATTLE_OB_RED, $1f - -; ANIM_OBJ_87 - battleanimobj RELATIVE_X | X_FLIP, $88, BATTLEANIMFRAMESET_8F, BATTLEANIMFUNC_3E, PAL_BATTLE_OB_GRAY, $1f - -; ANIM_OBJ_88 - battleanimobj RELATIVE_X | X_FLIP, $88, BATTLEANIMFRAMESET_93, BATTLEANIMFUNC_3E, PAL_BATTLE_OB_GRAY, $1f - -; ANIM_OBJ_89 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_97, BATTLEANIMFUNC_3D, PAL_BATTLE_OB_GRAY, $1f - -; ANIM_OBJ_8A - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_78, BATTLEANIMFUNC_3D, PAL_BATTLE_OB_YELLOW, $23 - -; ANIM_OBJ_8B - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_99, BATTLEANIMFUNC_2E, PAL_BATTLE_OB_GRAY, $19 - -; ANIM_OBJ_8C - battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_02, PAL_BATTLE_OB_GRAY, $15 - -; ANIM_OBJ_8D - battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_99, BATTLEANIMFUNC_35, PAL_BATTLE_OB_RED, $19 - -; ANIM_OBJ_SPIKES - battleanimobj RELATIVE_X | X_FLIP, $70, BATTLEANIMFRAMESET_8B, BATTLEANIMFUNC_3F, PAL_BATTLE_OB_GRAY, $1f - -; ANIM_OBJ_8F - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_15, BATTLEANIMFUNC_08, PAL_BATTLE_OB_GRAY, $0a - -; ANIM_OBJ_90 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_11, BATTLEANIMFUNC_02, PAL_BATTLE_OB_RED, $03 - -; ANIM_OBJ_91 - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_7F, BATTLEANIMFUNC_42, PAL_BATTLE_OB_GRAY, $08 - -; ANIM_OBJ_92 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_9A, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $1b - -; ANIM_OBJ_93 - battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_9B, BATTLEANIMFUNC_35, PAL_BATTLE_OB_RED, $23 - -; ANIM_OBJ_94 - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_9C, BATTLEANIMFUNC_23, PAL_BATTLE_OB_GRAY, $25 - -; ANIM_OBJ_95 - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_9D, BATTLEANIMFUNC_25, PAL_BATTLE_OB_GRAY, $25 - -; ANIM_OBJ_96 - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_9C, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $25 - -; ANIM_OBJ_97 - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_9E, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $25 - -; ANIM_OBJ_98 - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $80, BATTLEANIMFRAMESET_9F, BATTLEANIMFUNC_3A, PAL_BATTLE_OB_GREEN, $23 - -; ANIM_OBJ_99 - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_A0, BATTLEANIMFUNC_16, PAL_BATTLE_OB_GRAY, $23 - -; ANIM_OBJ_9A - battleanimobj RELATIVE_X | X_FLIP, $70, BATTLEANIMFRAMESET_78, BATTLEANIMFUNC_43, PAL_BATTLE_OB_YELLOW, $23 - -; ANIM_OBJ_9B - battleanimobj RELATIVE_X | X_FLIP, $c0, BATTLEANIMFRAMESET_A2, BATTLEANIMFUNC_01, PAL_BATTLE_OB_GRAY, $25 - -; ANIM_OBJ_9C - battleanimobj RELATIVE_X | X_FLIP, $40, BATTLEANIMFRAMESET_A3, BATTLEANIMFUNC_44, PAL_BATTLE_OB_YELLOW, $24 - -; ANIM_OBJ_9D - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_A4, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $24 - -; ANIM_OBJ_9E - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_A5, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $24 - -; ANIM_OBJ_9F - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_43, BATTLEANIMFUNC_45, PAL_BATTLE_OB_RED, $12 - -; ANIM_OBJ_A0 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_A6, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 - -; ANIM_OBJ_A1 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_A7, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 - -; ANIM_OBJ_A2 - battleanimobj RELATIVE_X | X_FLIP, $00, BATTLEANIMFRAMESET_B4, BATTLEANIMFUNC_4A, PAL_BATTLE_OB_BROWN, $0f - -; ANIM_OBJ_A3 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_A8, BATTLEANIMFUNC_02, PAL_BATTLE_OB_YELLOW, $05 - -; ANIM_OBJ_A4 - battleanimobj RELATIVE_X | X_FLIP, $40, BATTLEANIMFRAMESET_9C, BATTLEANIMFUNC_11, PAL_BATTLE_OB_GRAY, $25 - -; ANIM_OBJ_A5 - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $90, BATTLEANIMFRAMESET_A9, BATTLEANIMFUNC_46, PAL_BATTLE_OB_GRAY, $23 - -; ANIM_OBJ_PERISH_SONG - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_47, PAL_BATTLE_OB_GRAY, $0e - -; ANIM_OBJ_A7 - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_AA, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $24 - -; ANIM_OBJ_A8 - battleanimobj RELATIVE_X | X_FLIP, $b8, BATTLEANIMFRAMESET_AB, BATTLEANIMFUNC_48, PAL_BATTLE_OB_GRAY, $13 - -; ANIM_OBJ_A9 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_AC, BATTLEANIMFUNC_44, PAL_BATTLE_OB_GRAY, $13 - -; ANIM_OBJ_AA - battleanimobj RELATIVE_X, $a8, BATTLEANIMFRAMESET_05, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 - -; ANIM_OBJ_AB - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_43, PAL_BATTLE_OB_GRAY, $0e - -; ANIM_OBJ_AC - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_AD, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $17 - -; ANIM_OBJ_AD - battleanimobj RELATIVE_X, $a8, BATTLEANIMFRAMESET_AE, BATTLEANIMFUNC_49, PAL_BATTLE_OB_GRAY, $01 - -; ANIM_OBJ_AE - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_AF, BATTLEANIMFUNC_01, PAL_BATTLE_OB_YELLOW, $11 - -; ANIM_OBJ_AF - battleanimobj RELATIVE_X | X_FLIP, $00, BATTLEANIMFRAMESET_B0, BATTLEANIMFUNC_4A, PAL_BATTLE_OB_GRAY, $04 - -; ANIM_OBJ_B0 - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_70, BATTLEANIMFUNC_4B, PAL_BATTLE_OB_RED, $1c - -; ANIM_OBJ_B1 - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_B1, BATTLEANIMFUNC_4C, PAL_BATTLE_OB_GRAY, $19 - -; ANIM_OBJ_B2 - battleanimobj RELATIVE_X, $b8, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_4D, PAL_BATTLE_OB_BROWN, $09 - -; ANIM_OBJ_B3 - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $98, BATTLEANIMFRAMESET_B3, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $27 - -; ANIM_OBJ_B4 - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $98, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_04, PAL_BATTLE_OB_BLUE, $15 - -; ANIM_OBJ_B5 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_4E, PAL_BATTLE_OB_BROWN, $09 - -; ANIM_OBJ_FLOWER - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_73, BATTLEANIMFUNC_08, PAL_BATTLE_OB_RED, $1e - -; ANIM_OBJ_COTTON - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_89, BATTLEANIMFUNC_4F, PAL_BATTLE_OB_RED, $1f - -; ANIM_OBJ_PLAYERFEETFOLLOW - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B5, BATTLEANIMFUNC_00, PAL_BATTLE_OB_ENEMY, $28 - -; ANIM_OBJ_ENEMYFEETFOLLOW - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B6, BATTLEANIMFUNC_00, PAL_BATTLE_OB_PLAYER, $29 - -; ANIM_OBJ_BA - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B7, BATTLEANIMFUNC_00, PAL_BATTLE_OB_ENEMY, $28 - -; ANIM_OBJ_BB - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B8, BATTLEANIMFUNC_00, PAL_BATTLE_OB_PLAYER, $29 - +BattleAnimObjects: ; ccb56 +; entries correspond to ANIM_OBJ_* constants + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_00, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_00 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_01, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_01 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_02, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_02 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_00, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_03 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_01, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_04 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_02, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_05 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_03, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_06 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_04, BATTLEANIMFUNC_1B, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_07 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_05, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_08 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_06, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_09 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_07, BATTLEANIMFUNC_09, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_0A + battleanimobj RELATIVE_X, $aa, BATTLEANIMFRAMESET_10, BATTLEANIMFUNC_10, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_0B + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_0E, BATTLEANIMFUNC_04, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_0C + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_03, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_0D + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_10, BATTLEANIMFUNC_08, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_0E + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_0A, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_0F + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_11, BATTLEANIMFUNC_03, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_BURNED + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_12, BATTLEANIMFUNC_08, PAL_BATTLE_OB_BLUE, $0a ; ANIM_OBJ_BLIZZARD + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_13, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $0a ; ANIM_OBJ_12 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_14, BATTLEANIMFUNC_01, PAL_BATTLE_OB_BLUE, $0a ; ANIM_OBJ_ICE_BEAM + battleanimobj RELATIVE_X | X_FLIP, $78, BATTLEANIMFRAMESET_16, BATTLEANIMFUNC_RAZOR_LEAF, PAL_BATTLE_OB_GREEN, $06 ; ANIM_OBJ_RAZOR_LEAF + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_09, BATTLEANIMFUNC_12, PAL_BATTLE_OB_RED, $0b ; ANIM_OBJ_POKE_BALL + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_09, BATTLEANIMFUNC_13, PAL_BATTLE_OB_RED, $0b ; ANIM_OBJ_POKE_BALL_BLOCKED + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_18, BATTLEANIMFUNC_00, PAL_BATTLE_OB_RED, $08 ; ANIM_OBJ_17 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_18, BATTLEANIMFUNC_00, PAL_BATTLE_OB_RED, $08 ; ANIM_OBJ_18 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_1D, BATTLEANIMFUNC_06, PAL_BATTLE_OB_GRAY, $0c ; ANIM_OBJ_19 + battleanimobj RELATIVE_X, $b4, BATTLEANIMFRAMESET_1F, BATTLEANIMFUNC_38, PAL_BATTLE_OB_GRAY, $0c ; ANIM_OBJ_1A + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_08, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $07 ; ANIM_OBJ_1B + battleanimobj RELATIVE_X, $a0, BATTLEANIMFRAMESET_08, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $07 ; ANIM_OBJ_BALL_POOF + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_07, PAL_BATTLE_OB_BROWN, $09 ; ANIM_OBJ_1D + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_1A, BATTLEANIMFUNC_07, PAL_BATTLE_OB_BROWN, $09 ; ANIM_OBJ_1E + battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_1B, BATTLEANIMFUNC_36, PAL_BATTLE_OB_BROWN, $09 ; ANIM_OBJ_1F + battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_84, BATTLEANIMFUNC_36, PAL_BATTLE_OB_BLUE, $21 ; ANIM_OBJ_20 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_0C, PAL_BATTLE_OB_BLUE, $0d ; ANIM_OBJ_BUBBLE + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_23, BATTLEANIMFUNC_0D, PAL_BATTLE_OB_BLUE, $0d ; ANIM_OBJ_22 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_0E, PAL_BATTLE_OB_GRAY, $0e ; ANIM_OBJ_23 + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $80, BATTLEANIMFRAMESET_27, BATTLEANIMFUNC_0F, PAL_BATTLE_OB_BLUE, $04 ; ANIM_OBJ_24 + battleanimobj RELATIVE_X, $b4, BATTLEANIMFRAMESET_2A, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $04 ; ANIM_OBJ_25 + battleanimobj RELATIVE_X, $40, BATTLEANIMFRAMESET_2B, BATTLEANIMFUNC_11, PAL_BATTLE_OB_GREEN, $0f ; ANIM_OBJ_26 + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $98, BATTLEANIMFRAMESET_2C, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $10 ; ANIM_OBJ_27 + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $98, BATTLEANIMFRAMESET_2D, BATTLEANIMFUNC_09, PAL_BATTLE_OB_YELLOW, $10 ; ANIM_OBJ_28 + battleanimobj RELATIVE_X, $b8, BATTLEANIMFRAMESET_2E, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $0a ; ANIM_OBJ_ICE_BUILDUP + battleanimobj RELATIVE_X, $b8, BATTLEANIMFRAMESET_2F, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $0a ; ANIM_OBJ_FROZEN + battleanimobj RELATIVE_X, $b8, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_14, PAL_BATTLE_OB_BROWN, $11 ; ANIM_OBJ_MASTER_BALL_SPARKLE + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_14, PAL_BATTLE_OB_YELLOW, $0d ; ANIM_OBJ_2C + battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_31, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 ; ANIM_OBJ_2D + battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_32, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 ; ANIM_OBJ_2E + battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_33, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 ; ANIM_OBJ_2F + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_34, BATTLEANIMFUNC_15, PAL_BATTLE_OB_YELLOW, $05 ; ANIM_OBJ_30 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_36, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 ; ANIM_OBJ_31 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_37, BATTLEANIMFUNC_03, PAL_BATTLE_OB_GRAY, $08 ; ANIM_OBJ_LIGHTNING_BOLT + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_38, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 ; ANIM_OBJ_33 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_39, BATTLEANIMFUNC_03, PAL_BATTLE_OB_GRAY, $08 ; ANIM_OBJ_34 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_3A, BATTLEANIMFUNC_16, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_35 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_3C, BATTLEANIMFUNC_17, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_36 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_3E, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_37 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_3F, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_38 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_40, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_39 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_41, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_3A + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_42, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_3B + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_43, BATTLEANIMFUNC_18, PAL_BATTLE_OB_GREEN, $12 ; ANIM_OBJ_3C + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_44, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GREEN, $12 ; ANIM_OBJ_3D + battleanimobj RELATIVE_X | X_FLIP, $b8, BATTLEANIMFRAMESET_45, BATTLEANIMFUNC_19, PAL_BATTLE_OB_GRAY, $13 ; ANIM_OBJ_GUST + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_46, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $14 ; ANIM_OBJ_3F + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_47, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $14 ; ANIM_OBJ_40 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_48, BATTLEANIMFUNC_1A, PAL_BATTLE_OB_GRAY, $14 ; ANIM_OBJ_41 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_49, BATTLEANIMFUNC_1A, PAL_BATTLE_OB_GRAY, $14 ; ANIM_OBJ_42 + battleanimobj RELATIVE_X | X_FLIP, $98, BATTLEANIMFRAMESET_4A, BATTLEANIMFUNC_01, PAL_BATTLE_OB_GRAY, $14 ; ANIM_OBJ_43 + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_4B, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $11 ; ANIM_OBJ_44 + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_4C, BATTLEANIMFUNC_1C, PAL_BATTLE_OB_GREEN, $12 ; ANIM_OBJ_ABSORB + battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_4D, BATTLEANIMFUNC_1D, PAL_BATTLE_OB_GRAY, $15 ; ANIM_OBJ_46 + battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_51, BATTLEANIMFUNC_1E, PAL_BATTLE_OB_YELLOW, $11 ; ANIM_OBJ_47 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_52, BATTLEANIMFUNC_1F, PAL_BATTLE_OB_GREEN, $16 ; ANIM_OBJ_48 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_54, BATTLEANIMFUNC_1F, PAL_BATTLE_OB_GREEN, $16 ; ANIM_OBJ_49 + battleanimobj RELATIVE_X | X_FLIP, $68, BATTLEANIMFRAMESET_56, BATTLEANIMFUNC_LEECH_SEED, PAL_BATTLE_OB_GREEN, $06 ; ANIM_OBJ_LEECH_SEED + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_59, BATTLEANIMFUNC_21, PAL_BATTLE_OB_GRAY, $0e ; ANIM_OBJ_4B + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_5C, BATTLEANIMFUNC_02, PAL_BATTLE_OB_GRAY, $17 ; ANIM_OBJ_4C + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_5D, BATTLEANIMFUNC_22, PAL_BATTLE_OB_YELLOW, $11 ; ANIM_OBJ_4D + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $88, BATTLEANIMFRAMESET_5F, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $10 ; ANIM_OBJ_4E + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $88, BATTLEANIMFRAMESET_2D, BATTLEANIMFUNC_09, PAL_BATTLE_OB_YELLOW, $10 ; ANIM_OBJ_4F + battleanimobj RELATIVE_X | X_FLIP, $88, BATTLEANIMFRAMESET_60, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $18 ; ANIM_OBJ_50 + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_60, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $18 ; ANIM_OBJ_51 + battleanimobj RELATIVE_X | X_FLIP, $50, BATTLEANIMFRAMESET_61, BATTLEANIMFUNC_23, PAL_BATTLE_OB_YELLOW, $19 ; ANIM_OBJ_CHICK + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_63, BATTLEANIMFUNC_24, PAL_BATTLE_OB_GRAY, $19 ; ANIM_OBJ_53 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_66, BATTLEANIMFUNC_25, PAL_BATTLE_OB_GRAY, $19 ; ANIM_OBJ_54 + battleanimobj RELATIVE_X, $50, BATTLEANIMFRAMESET_1C, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $0c ; ANIM_OBJ_SKULL + battleanimobj RELATIVE_X | X_FLIP, $a8, BATTLEANIMFRAMESET_67, BATTLEANIMFUNC_26, PAL_BATTLE_OB_BROWN, $1a ; ANIM_OBJ_56 + battleanimobj RELATIVE_X | X_FLIP, $a8, BATTLEANIMFRAMESET_68, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BROWN, $1a ; ANIM_OBJ_57 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_69, BATTLEANIMFUNC_01, PAL_BATTLE_OB_GRAY, $1a ; ANIM_OBJ_58 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_6D, BATTLEANIMFUNC_28, PAL_BATTLE_OB_YELLOW, $19 ; ANIM_OBJ_PARALYZED + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_6A, BATTLEANIMFUNC_27, PAL_BATTLE_OB_GRAY, $1b ; ANIM_OBJ_5A + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_SPRIAL_DESCENT, PAL_BATTLE_OB_GRAY, $1c ; ANIM_OBJ_HAZE + battleanimobj RELATIVE_X | X_FLIP, $48, BATTLEANIMFRAMESET_70, BATTLEANIMFUNC_SPRIAL_DESCENT, PAL_BATTLE_OB_GRAY, $1c ; ANIM_OBJ_MIST + battleanimobj RELATIVE_X | X_FLIP, $48, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_SPRIAL_DESCENT, PAL_BATTLE_OB_GRAY, $1c ; ANIM_OBJ_SMOG + battleanimobj RELATIVE_X | X_FLIP, $78, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_POISON_GAS, PAL_BATTLE_OB_GRAY, $1c ; ANIM_OBJ_POISON_GAS + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $90, BATTLEANIMFRAMESET_71, BATTLEANIMFUNC_HORN, PAL_BATTLE_OB_GRAY, $1d ; ANIM_OBJ_HORN + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $90, BATTLEANIMFRAMESET_72, BATTLEANIMFUNC_2C, PAL_BATTLE_OB_GRAY, $1d ; ANIM_OBJ_60 + battleanimobj RELATIVE_X, $48, BATTLEANIMFRAMESET_73, BATTLEANIMFUNC_2D, PAL_BATTLE_OB_RED, $1e ; ANIM_OBJ_61 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_06, PAL_BATTLE_OB_GRAY, $15 ; ANIM_OBJ_62 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_75, BATTLEANIMFUNC_2E, PAL_BATTLE_OB_BROWN, $19 ; ANIM_OBJ_63 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_4A, BATTLEANIMFUNC_02, PAL_BATTLE_OB_GRAY, $14 ; ANIM_OBJ_64 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_2F, PAL_BATTLE_OB_GRAY, $11 ; ANIM_OBJ_65 + battleanimobj RELATIVE_X, $78, BATTLEANIMFRAMESET_76, BATTLEANIMFUNC_POISON_GAS, PAL_BATTLE_OB_RED, $23 ; ANIM_OBJ_66 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_30, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_67 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_02, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_68 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_69 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_78, BATTLEANIMFUNC_08, PAL_BATTLE_OB_YELLOW, $23 ; ANIM_OBJ_6A + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_79, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_6B + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_7A, BATTLEANIMFUNC_31, PAL_BATTLE_OB_YELLOW, $11 ; ANIM_OBJ_6C + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_7A, BATTLEANIMFUNC_31, PAL_BATTLE_OB_YELLOW, $11 ; ANIM_OBJ_6D + battleanimobj RELATIVE_X | X_FLIP, $88, BATTLEANIMFRAMESET_7B, BATTLEANIMFUNC_32, PAL_BATTLE_OB_GRAY, $20 ; ANIM_OBJ_SKY_ATTACK_FEAROW + battleanimobj RELATIVE_X | X_FLIP, $98, BATTLEANIMFRAMESET_7C, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $04 ; ANIM_OBJ_LICK + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_7D, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $18 ; ANIM_OBJ_WITHDRAW + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_2F, PAL_BATTLE_OB_BLUE, $0d ; ANIM_OBJ_71 + battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_7E, BATTLEANIMFUNC_33, PAL_BATTLE_OB_YELLOW, $12 ; ANIM_OBJ_72 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_7F, BATTLEANIMFUNC_2F, PAL_BATTLE_OB_GRAY, $08 ; ANIM_OBJ_73 + battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_34, PAL_BATTLE_OB_GRAY, $1c ; ANIM_OBJ_74 + battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_35, PAL_BATTLE_OB_GRAY, $15 ; ANIM_OBJ_75 + battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_80, BATTLEANIMFUNC_33, PAL_BATTLE_OB_GRAY, $14 ; ANIM_OBJ_76 + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_81, BATTLEANIMFUNC_37, PAL_BATTLE_OB_GRAY, $11 ; ANIM_OBJ_77 + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_85, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $22 ; ANIM_OBJ_78 + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_86, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $22 ; ANIM_OBJ_79 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_87, BATTLEANIMFUNC_39, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_7A + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_3A, PAL_BATTLE_OB_YELLOW, $11 ; ANIM_OBJ_7B + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_34, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 ; ANIM_OBJ_7C + battleanimobj RELATIVE_X | X_FLIP | BEHIND_BG, $88, BATTLEANIMFRAMESET_88, BATTLEANIMFUNC_3B, PAL_BATTLE_OB_BLUE, $13 ; ANIM_OBJ_7D + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_76, BATTLEANIMFUNC_25, PAL_BATTLE_OB_RED, $23 ; ANIM_OBJ_HEART + battleanimobj RELATIVE_X, $98, BATTLEANIMFRAMESET_10, BATTLEANIMFUNC_34, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_7F + battleanimobj RELATIVE_X, $a8, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_3C, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_80 + battleanimobj RELATIVE_X | X_FLIP, $68, BATTLEANIMFRAMESET_89, BATTLEANIMFUNC_SPRIAL_DESCENT, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_COTTON_SPORE + battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_8A, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_82 + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_8C, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_83 + battleanimobj RELATIVE_X | X_FLIP, $50, BATTLEANIMFRAMESET_8D, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $1f ; ANIM_OBJ_84 + battleanimobj RELATIVE_X, $40, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_40, PAL_BATTLE_OB_GRAY, $0e ; ANIM_OBJ_85 + battleanimobj RELATIVE_X | X_FLIP, $a8, BATTLEANIMFRAMESET_8E, BATTLEANIMFUNC_41, PAL_BATTLE_OB_RED, $1f ; ANIM_OBJ_86 + battleanimobj RELATIVE_X | X_FLIP, $88, BATTLEANIMFRAMESET_8F, BATTLEANIMFUNC_3E, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_87 + battleanimobj RELATIVE_X | X_FLIP, $88, BATTLEANIMFRAMESET_93, BATTLEANIMFUNC_3E, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_88 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_97, BATTLEANIMFUNC_3D, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_89 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_78, BATTLEANIMFUNC_3D, PAL_BATTLE_OB_YELLOW, $23 ; ANIM_OBJ_8A + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_99, BATTLEANIMFUNC_2E, PAL_BATTLE_OB_GRAY, $19 ; ANIM_OBJ_8B + battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_02, PAL_BATTLE_OB_GRAY, $15 ; ANIM_OBJ_8C + battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_99, BATTLEANIMFUNC_35, PAL_BATTLE_OB_RED, $19 ; ANIM_OBJ_8D + battleanimobj RELATIVE_X | X_FLIP, $70, BATTLEANIMFRAMESET_8B, BATTLEANIMFUNC_3F, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_SPIKES + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_15, BATTLEANIMFUNC_08, PAL_BATTLE_OB_GRAY, $0a ; ANIM_OBJ_8F + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_11, BATTLEANIMFUNC_02, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_90 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_7F, BATTLEANIMFUNC_42, PAL_BATTLE_OB_GRAY, $08 ; ANIM_OBJ_91 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_9A, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $1b ; ANIM_OBJ_92 + battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_9B, BATTLEANIMFUNC_35, PAL_BATTLE_OB_RED, $23 ; ANIM_OBJ_93 + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_9C, BATTLEANIMFUNC_23, PAL_BATTLE_OB_GRAY, $25 ; ANIM_OBJ_94 + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_9D, BATTLEANIMFUNC_25, PAL_BATTLE_OB_GRAY, $25 ; ANIM_OBJ_95 + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_9C, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $25 ; ANIM_OBJ_96 + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_9E, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $25 ; ANIM_OBJ_97 + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $80, BATTLEANIMFRAMESET_9F, BATTLEANIMFUNC_3A, PAL_BATTLE_OB_GREEN, $23 ; ANIM_OBJ_98 + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_A0, BATTLEANIMFUNC_16, PAL_BATTLE_OB_GRAY, $23 ; ANIM_OBJ_99 + battleanimobj RELATIVE_X | X_FLIP, $70, BATTLEANIMFRAMESET_78, BATTLEANIMFUNC_43, PAL_BATTLE_OB_YELLOW, $23 ; ANIM_OBJ_9A + battleanimobj RELATIVE_X | X_FLIP, $c0, BATTLEANIMFRAMESET_A2, BATTLEANIMFUNC_01, PAL_BATTLE_OB_GRAY, $25 ; ANIM_OBJ_9B + battleanimobj RELATIVE_X | X_FLIP, $40, BATTLEANIMFRAMESET_A3, BATTLEANIMFUNC_44, PAL_BATTLE_OB_YELLOW, $24 ; ANIM_OBJ_9C + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_A4, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $24 ; ANIM_OBJ_9D + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_A5, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $24 ; ANIM_OBJ_9E + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_43, BATTLEANIMFUNC_45, PAL_BATTLE_OB_RED, $12 ; ANIM_OBJ_9F + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_A6, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_A0 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_A7, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_A1 + battleanimobj RELATIVE_X | X_FLIP, $00, BATTLEANIMFRAMESET_B4, BATTLEANIMFUNC_4A, PAL_BATTLE_OB_BROWN, $0f ; ANIM_OBJ_A2 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_A8, BATTLEANIMFUNC_02, PAL_BATTLE_OB_YELLOW, $05 ; ANIM_OBJ_A3 + battleanimobj RELATIVE_X | X_FLIP, $40, BATTLEANIMFRAMESET_9C, BATTLEANIMFUNC_11, PAL_BATTLE_OB_GRAY, $25 ; ANIM_OBJ_A4 + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $90, BATTLEANIMFRAMESET_A9, BATTLEANIMFUNC_46, PAL_BATTLE_OB_GRAY, $23 ; ANIM_OBJ_A5 + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_47, PAL_BATTLE_OB_GRAY, $0e ; ANIM_OBJ_PERISH_SONG + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_AA, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $24 ; ANIM_OBJ_A7 + battleanimobj RELATIVE_X | X_FLIP, $b8, BATTLEANIMFRAMESET_AB, BATTLEANIMFUNC_48, PAL_BATTLE_OB_GRAY, $13 ; ANIM_OBJ_A8 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_AC, BATTLEANIMFUNC_44, PAL_BATTLE_OB_GRAY, $13 ; ANIM_OBJ_A9 + battleanimobj RELATIVE_X, $a8, BATTLEANIMFRAMESET_05, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_AA + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_43, PAL_BATTLE_OB_GRAY, $0e ; ANIM_OBJ_AB + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_AD, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $17 ; ANIM_OBJ_AC + battleanimobj RELATIVE_X, $a8, BATTLEANIMFRAMESET_AE, BATTLEANIMFUNC_49, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_AD + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_AF, BATTLEANIMFUNC_01, PAL_BATTLE_OB_YELLOW, $11 ; ANIM_OBJ_AE + battleanimobj RELATIVE_X | X_FLIP, $00, BATTLEANIMFRAMESET_B0, BATTLEANIMFUNC_4A, PAL_BATTLE_OB_GRAY, $04 ; ANIM_OBJ_AF + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_70, BATTLEANIMFUNC_4B, PAL_BATTLE_OB_RED, $1c ; ANIM_OBJ_B0 + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_B1, BATTLEANIMFUNC_4C, PAL_BATTLE_OB_GRAY, $19 ; ANIM_OBJ_B1 + battleanimobj RELATIVE_X, $b8, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_4D, PAL_BATTLE_OB_BROWN, $09 ; ANIM_OBJ_B2 + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $98, BATTLEANIMFRAMESET_B3, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $27 ; ANIM_OBJ_B3 + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $98, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_04, PAL_BATTLE_OB_BLUE, $15 ; ANIM_OBJ_B4 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_4E, PAL_BATTLE_OB_BROWN, $09 ; ANIM_OBJ_B5 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_73, BATTLEANIMFUNC_08, PAL_BATTLE_OB_RED, $1e ; ANIM_OBJ_FLOWER + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_89, BATTLEANIMFUNC_4F, PAL_BATTLE_OB_RED, $1f ; ANIM_OBJ_COTTON + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B5, BATTLEANIMFUNC_00, PAL_BATTLE_OB_ENEMY, $28 ; ANIM_OBJ_PLAYERFEETFOLLOW + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B6, BATTLEANIMFUNC_00, PAL_BATTLE_OB_PLAYER, $29 ; ANIM_OBJ_ENEMYFEETFOLLOW + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B7, BATTLEANIMFUNC_00, PAL_BATTLE_OB_ENEMY, $28 ; ANIM_OBJ_BA + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B8, BATTLEANIMFUNC_00, PAL_BATTLE_OB_PLAYER, $29 ; ANIM_OBJ_BB ; ccfbe diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm index 6a0c2ecf8..64c390cbe 100755 --- a/battle/objects/functions.asm +++ b/battle/objects/functions.asm @@ -450,7 +450,7 @@ GetBallAnimPal: ; cd249 (33:5249) ret ; cd26c (33:526c) -INCLUDE "data/ball_colors.asm" +INCLUDE "data/battle/ball_colors.asm" BattleAnimFunction_10: ; cd284 (33:5284) call BattleAnim_AnonJumptable diff --git a/battle/objects/gfx_headers.asm b/battle/objects/gfx_headers.asm index 60164918b..901144ec7 100755 --- a/battle/objects/gfx_headers.asm +++ b/battle/objects/gfx_headers.asm @@ -1,12 +1,11 @@ - -AnimObjGFX: ; cfcf6 - object_gfx: MACRO ; # tiles, label db \1 dba \2 ENDM +AnimObjGFX: ; cfcf6 +; entries correspond to ANIM_GFX_* constants object_gfx 0, AnimObj00GFX object_gfx 21, AnimObjHitGFX object_gfx 6, AnimObjCutGFX diff --git a/constants.asm b/constants.asm index 16f50bb02..b8c38cc46 100644 --- a/constants.asm +++ b/constants.asm @@ -1,13 +1,12 @@ INCLUDE "macros.asm" -INCLUDE "gbhw.asm" INCLUDE "hram.asm" +INCLUDE "constants/hardware_constants.asm" INCLUDE "constants/wram_constants.asm" INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/type_constants.asm" INCLUDE "constants/move_constants.asm" -INCLUDE "constants/effect_command_constants.asm" INCLUDE "constants/battle_constants.asm" INCLUDE "constants/map_dimension_constants.asm" INCLUDE "constants/map_constants.asm" @@ -22,6 +21,7 @@ INCLUDE "constants/music_constants.asm" INCLUDE "constants/sfx_constants.asm" INCLUDE "constants/animation_constants.asm" INCLUDE "constants/phone_constants.asm" +INCLUDE "constants/credits_constants.asm" INCLUDE "constants/gfx_constants.asm" INCLUDE "constants/input_constants.asm" INCLUDE "constants/pokemon_data_constants.asm" diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index dd39df20f..861c35ee0 100755 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm @@ -1,5 +1,5 @@ ; pitch -; FrequencyTable indexes (see data/audio/notes.asm) +; FrequencyTable indexes (see audio/notes.asm) const_def const __ ; 0 const C_ ; 1 @@ -67,4 +67,22 @@ NUM_CHANNELS EQU const_value const NOTE_VIBRATO_OVERRIDE ; 6 ; Volume: +VOLUME_SO1_F EQU 3 +VOLUME_SO2_F EQU 7 +VOLUME_SO1_LEVEL EQU %00000111 +VOLUME_SO2_LEVEL EQU %01110000 MAX_VOLUME EQU $77 + +; SoundInput: +SOUND_INPUT_CH1_F EQU 0 +SOUND_INPUT_CH2_F EQU 1 +SOUND_INPUT_CH3_F EQU 2 +SOUND_INPUT_CH4_F EQU 3 +SOUND_INPUT_GLOBAL_F EQU 7 + +; Danger: +DANGER_PITCH_F EQU 4 +DANGER_ON_F EQU 7 + +; MusicFade: +MUSIC_FADE_IN_F EQU 7 diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index 5ab69d752..74df3a36a 100755 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -1,4 +1,4 @@ -; BattleTowerAction arguments (see misc/battle_tower_5c.asm) +; BattleTowerAction arguments (see mobile/battle_tower_5c.asm) const_def const BATTLETOWERACTION_CHECK_EXPLANATION_READ const BATTLETOWERACTION_SET_EXPLANATION_READ @@ -20,8 +20,8 @@ const BATTLETOWERACTION_11 ; store 0 in 5:aa8d const BATTLETOWERACTION_12 ; store 1 in 5:aa8d const BATTLETOWERACTION_13 ; check 5:aa8d - const BATTLETOWERACTION_14 ; if save file is yours: bit 0, [s1_be4f] - const BATTLETOWERACTION_15 ; set 0, [s1_be4f] + const BATTLETOWERACTION_14 ; if save file is yours: bit 0, [sBattleTowerSaveFileFlags] + const BATTLETOWERACTION_15 ; set 0, [sBattleTowerSaveFileFlags] const BATTLETOWERACTION_16 ; update time in SRAM bank 5 const BATTLETOWERACTION_17 ; check time in SRAM bank 5 const BATTLETOWERACTION_LEVEL_CHECK diff --git a/constants/cgb_constants.asm b/constants/cgb_constants.asm index c5aef7750..c419cd465 100755 --- a/constants/cgb_constants.asm +++ b/constants/cgb_constants.asm @@ -1,4 +1,4 @@ -; GetSGBLayout arguments (see predef/cgb.asm and predef/sgb.asm) +; GetSGBLayout arguments (see engine/cgb_layouts.asm and engine/sgb_layouts.asm) const_def const SCGB_BATTLE_GRAYSCALE const SCGB_BATTLE_COLORS diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm new file mode 100644 index 000000000..8ee0391de --- /dev/null +++ b/constants/credits_constants.asm @@ -0,0 +1,115 @@ +; CreditsStrings indexes (see data/credits_text.asm) + const_def + const SATOSHI_TAJIRI + const JUNICHI_MASUDA + const TETSUYA_WATANABE + const SHIGEKI_MORIMOTO + const SOUSUKE_TAMADA + const TAKENORI_OOTA + const KEN_SUGIMORI + const MOTOFUMI_FUJIWARA + const ATSUKO_NISHIDA + const MUNEO_SAITO + const SATOSHI_OOTA + const RENA_YOSHIKAWA + const JUN_OKUTANI + const HIRONOBU_YOSHIDA + const ASUKA_IWASHITA + const GO_ICHINOSE + const MORIKAZU_AOKI + const KOHJI_NISHINO + const KENJI_MATSUSHIMA + const TOSHINOBU_MATSUMIYA + const SATORU_IWATA + const NOBUHIRO_SEYA + const KAZUHITO_SEKINE + const TETSUJI_OOTA + const NCL_SUPER_MARIO_CLUB + const SARUGAKUCHO + const AKITO_MORI + const TAKAHIRO_HARADA + const TOHRU_HASHIMOTO + const NOBORU_MATSUMOTO + const TAKEHIRO_IZUSHI + const TAKASHI_KAWAGUCHI + const TSUNEKAZU_ISHIHARA + const HIROSHI_YAMAUCHI + const KENJI_SAIKI + const ATSUSHI_TADA + const NAOKO_KAWAKAMI + const HIROYUKI_ZINNAI + const KUNIMI_KAWAMURA + const HISASHI_SOGABE + const KEITA_KAGAYA + const YOSHINORI_MATSUDA + const HITOMI_SATO + const TORU_OSAWA + const TAKAO_OHARA + const YUICHIRO_ITO + const TAKAO_SHIMIZU + const PLANNING + const KEITA_NAKAMURA + const HIROTAKA_UEMURA + const HIROAKI_TAMURA + const NORIAKI_SAKAGUCHI + const MIYUKI_SATO + const GAKUZI_NOMOTO + const AI_MASHIMA + const MIKIHIRO_ISHIKAWA + const HIDEYUKI_HASHIMOTO + const SATOSHI_YAMATO + const SHIGERU_MIYAMOTO + const GAIL_TILDEN + const NOB_OGASAWARA + const SETH_MCMAHILL + const HIROTO_ALEXANDER + const TERESA_LILLYGREN + const THOMAS_HERTZOG + const ERIK_JOHNSON + const HIRO_NAKAMURA + const TERUKI_MURAKAWA + const KAZUYOSHI_OSAWA + const KIMIKO_NAKAMICHI + const CREDIT_END + const CREDIT_UNKNOWN + const STAFF + const DIRECTOR + const CODIRECTOR + const PROGRAMMERS + const GRAPHICS_DIRECTOR + const MONSTER_DESIGN + const GRAPHICS_DESIGN + const CREDIT_MUSIC + const CREDIT_SOUND_EFFECTS + const GAME_DESIGN + const GAME_SCENARIO + const TOOL_PROGRAMMING + const PARAMETRIC_DESIGN + const SCRIPT_DESIGN + const MAP_DATA_DESIGN + const MAP_DESIGN + const PRODUCT_TESTING + const SPECIAL_THANKS + const PRODUCERS + const EXECUTIVE_PRODUCER + const POKEMON_ANIMATION + const POKEDEX_TEXT + const MOBILE_PRJ_LEADER + const MOBILE_SYSTEM_AD + const MOBILE_STADIUM_DIR + const COORDINATION + const COPYRIGHT + const US_VERSION_STAFF + const US_COORDINATION + const TEXT_TRANSLATION + const PAAD_TESTING + +; CreditsScript indexes (see data/credits_script.asm) +const_value SET -7 + const CREDITS_THEEND + const CREDITS_WAIT2 + const CREDITS_MUSIC + const CREDITS_CLEAR + const CREDITS_SCENE + const CREDITS_WAIT + const CREDITS_END diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 445f0d815..4c3b23fc9 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -19,3 +19,6 @@ HP_BAR_LENGTH EQU 6 ; tiles HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels EXP_BAR_LENGTH EQU 8 ; tiles EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels + + +PALPACKET_LENGTH EQU $10 diff --git a/gbhw.asm b/constants/hardware_constants.asm similarity index 100% rename from gbhw.asm rename to constants/hardware_constants.asm diff --git a/constants/item_constants.asm b/constants/item_constants.asm index d9cd99a34..f03cf2735 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -1,9 +1,9 @@ ; item ids ; indexes for: -; - ItemAttributes (see items/item_attributes.asm) -; - ItemDescriptions (see items/item_descriptions.asm) -; - ItemEffects (see items/item_effects.asm) -; - ItemNames (see items/item_names.asm) +; - ItemAttributes (see data/items/item_attributes.asm) +; - ItemDescriptions (see data/items/item_descriptions.asm) +; - ItemEffects (see engine/item_effects.asm) +; - ItemNames (see data/items/item_names.asm) const_def const NO_ITEM ; $00 const MASTER_BALL ; $01 @@ -372,7 +372,7 @@ const_value SET 70 const HELD_78 const HELD_FOCUS_BAND -; item_attribute struct members (see items/item_attributes.asm) +; item_attribute struct members (see data/items/item_attributes.asm) const_def const ITEMATTR_PRICE const ITEMATTR_PRICE_HI @@ -397,7 +397,7 @@ ITEMMENU_CLOSE EQU 6 const MARTTYPE_PHARMACY const MARTTYPE_ROOFTOP -; Marts indexes (see items/marts.asm) +; Marts indexes (see data/items/marts.asm) const_def const MART_CHERRYGROVE const MART_CHERRYGROVE_DEX diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index e53d44d04..0b29b8e03 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -1,4 +1,4 @@ -; Landmarks indexes (see data/landmarks.asm) +; Landmarks indexes (see data/maps/landmarks.asm) const_def ; Johto landmarks diff --git a/constants/map_constants.asm b/constants/map_constants.asm index be73faf9e..22b02f1c1 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -127,7 +127,7 @@ SLIDING EQU 3 EMOTE_OBJECT EQU 7 -; SpawnPoints indexes (see data/spawn_points.asm) +; SpawnPoints indexes (see data/maps/spawn_points.asm) const_value = -1 const SPAWN_N_A const SPAWN_HOME @@ -203,7 +203,7 @@ NUM_SPAWNS EQU const_value const EMOTE_GRASS_RUSTLE ; 11 EMOTE_MEM EQU -1 -; FruitTreeItems indexes (see data/fruit_tree_items.asm) +; FruitTreeItems indexes (see data/items/fruit_trees.asm) const_value SET 1 const FRUITTREE_ROUTE_29 ; 01 const FRUITTREE_ROUTE_30_1 ; 02 diff --git a/constants/map_dimension_constants.asm b/constants/map_dimension_constants.asm index d7fead006..714bbe02b 100644 --- a/constants/map_dimension_constants.asm +++ b/constants/map_dimension_constants.asm @@ -1,8 +1,23 @@ +newgroup: macro +const_value = const_value + 1 + enum_start 1 +endm + +mapgroup: macro +;\1: map id +;\2: height: in blocks +;\3: width: in blocks +GROUP_\1 EQU const_value + enum MAP_\1 +\1_HEIGHT EQU \2 +\1_WIDTH EQU \3 +endm + ; map group ids ; `newgroup` indexes are for: ; - MapGroupPointers (see maps/map_headers.asm) -; - OutdoorSprites (see data/outdoor_sprites.asm) -; - MapGroupRoofs (see data/mapgroup_roofs.asm) +; - OutdoorSprites (see data/maps/outdoor_sprites.asm) +; - MapGroupRoofs (see data/maps/mapgroup_roofs.asm) ; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see maps/map_headers.asm) const_def @@ -214,7 +229,7 @@ mapgroup EARLS_POKEMON_ACADEMY, 8, 4 ; 8 mapgroup VIOLET_NICKNAME_SPEECH_HOUSE, 4, 4 ; 9 mapgroup VIOLET_POKECENTER_1F, 4, 5 ; 10 - mapgroup VIOLET_ONIX_TRADE_HOUSE, 4, 4 ; 11 + mapgroup VIOLET_KYLES_HOUSE, 4, 4 ; 11 mapgroup ROUTE_32_RUINS_OF_ALPH_GATE, 4, 5 ; 12 mapgroup ROUTE_32_POKECENTER_1F, 4, 5 ; 13 mapgroup ROUTE_35_GOLDENROD_GATE, 4, 5 ; 14 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 7510fdf50..25032cc10 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -27,7 +27,7 @@ ITEM_NAME_LENGTH EQU 13 TRAINER_CLASS_NAME_LENGTH EQU 13 NAME_LENGTH_JAPANESE EQU 6 -; GetName types (see home.asm) +; GetName types (see home/names.asm) PKMN_NAME EQU 1 MOVE_NAME EQU 2 ; dummied out EQU 3 @@ -44,12 +44,13 @@ const_value set 5 const PRINTNUM_RIGHTALIGN_F ; 6 const PRINTNUM_LEADINGZEROS_F ; 7 +; PrintNum arguments (see engine/printnum.asm) PRINTNUM_MONEY EQU 1 << PRINTNUM_MONEY_F PRINTNUM_RIGHTALIGN EQU 1 << PRINTNUM_RIGHTALIGN_F PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F -; movement +; DoPlayerMovement.DoStep arguments (see engine/player_movement.asm) const_def const STEP_SLOW ; 0 const STEP_WALK ; 1 @@ -61,10 +62,16 @@ PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F const STEP_WALK_IN_PLACE ; 7 +; hMenuReturn HMENURETURN_SCRIPT EQU %10000000 HMENURETURN_ASM EQU %11111111 +; save file corruption check values +SAVE_CHECK_VALUE_1 EQU 99 +SAVE_CHECK_VALUE_2 EQU 127 + + ; time of day boundaries MORN_HOUR EQU 4 ; 4 AM DAY_HOUR EQU 10 ; 10 AM diff --git a/constants/mobile_constants.asm b/constants/mobile_constants.asm index 0ac28c94b..b5894b8e9 100644 --- a/constants/mobile_constants.asm +++ b/constants/mobile_constants.asm @@ -1,4 +1,4 @@ -; MobileEZChatCategoryPointers indexes (see misc/fixed_words.asm) +; MobileEZChatCategoryPointers indexes (see mobile/fixed_words.asm) const_def const EZCHAT_POKEMON const EZCHAT_TYPES @@ -16,6 +16,6 @@ const EZCHAT_FAREWELLS const EZCHAT_THISANDTHAT -NUM_KANA EQU 45 ; length of SortedPokemon table (see misc/fixed_words.asm) +NUM_KANA EQU 45 ; length of SortedPokemon table (see mobile/fixed_words.asm) MOBILE_LOGIN_PASSWORD_LENGTH EQU 17 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 14635d729..13cb577bb 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -1,22 +1,22 @@ ; pokemon ids ; indexes for: -; - CryHeaders (see audio/cry_headers.asm) -; - BaseData (see data/base_stats.asm) -; - EggMovePointers (see data/egg_move_pointers.asm) -; - EvosAttacksPointers (see data/evos_attacks_pointers.asm) -; - PokemonNames (see data/pokemon_names.asm) -; - PokedexDataPointerTable (see data/pokedex/entry_pointers.asm) +; - CryHeaders (see data/pokemon/cry_headers.asm) +; - BaseData (see data/pokemon/base_stats.asm) +; - EggMovePointers (see data/pokemon/egg_move_pointers.asm) +; - EvosAttacksPointers (see data/pokemon/evos_attacks_pointers.asm) +; - PokemonNames (see data/pokemon/pokemon_names.asm) +; - PokedexDataPointerTable (see data/pokemon/dex_entry_pointers.asm) ; - AnimationPointers (see gfx/pics/anim_pointers.asm) ; - BitmasksPointers (see gfx/pics/bitmask_pointers.asm) ; - AnimationExtraPointers (see gfx/pics/extra_pointers.asm) ; - FramesPointers (see gfx/pics/frame_pointers.asm) ; - PokemonPalettes (see gfx/pics/palette_pointers.asm) ; - PicPointers (see gfx/pics/pic_pointers.asm) -; - AlphabeticalPokedexOrder (see data/pokedex/order_alpha.asm) -; - NewPokedexOrder (see data/pokedex/order_new.asm) -; - MonMenuIcons (see data/mon_menu_icons.asm) -; - Pokered_MonIndices (see engine/time_capsule/conversion.asm) -; - SortedPokemon (see misc/fixed_words.asm) +; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm) +; - NewPokedexOrder (see data/pokemon/dex_order_new.asm) +; - MonMenuIcons (see data/pokemon/menu_icons.asm) +; - Pokered_MonIndices (see data/time_capsule/mon_order.asm) +; - SortedPokemon (see mobile/fixed_words.asm) const_value set 1 const BULBASAUR ; 01 const IVYSAUR ; 02 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 3c6b77206..4093adfa9 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -1,4 +1,4 @@ -; base data struct members (see data/base_stats/*.asm) +; base data struct members (see data/pokemon/base_stats/*.asm) BASE_DEX_NO EQUS "(BaseDexNo - CurBaseData)" BASE_STATS EQUS "(BaseStats - CurBaseData)" BASE_HP EQUS "(BaseHP - CurBaseData)" @@ -25,8 +25,17 @@ BASE_EGG_GROUPS EQUS "(BaseEggGroups - CurBaseData)" BASE_TMHM EQUS "(BaseTMHM - CurBaseData)" BASE_DATA_SIZE EQUS "(CurBaseDataEnd - CurBaseData)" +; gender ratio constants +GENDER_F0 EQU 0 percent +GENDER_F12_5 EQU 31 ; 12.5 percent +GENDER_F25 EQU 25 percent +GENDER_F50 EQU 50 percent +GENDER_F75 EQU 75 percent +GENDER_F100 EQU 254 ; 100 percent +GENDERLESS EQU 255 + ; BaseGrowthRate values -; GrowthRates indexes (see main.asm) +; GrowthRates indexes (see data/growth_rates.asm) const_def const MEDIUM_FAST const SLIGHTLY_FAST @@ -136,7 +145,7 @@ PARTY_LENGTH EQU 6 const ICON_BIGMON -; evolution types (used in data/evos_attacks.asm) +; evolution types (used in data/pokemon/evos_attacks.asm) const_value SET 1 const EVOLVE_LEVEL const EVOLVE_ITEM diff --git a/constants/std_constants.asm b/constants/std_constants.asm index 0667f020f..21fb6791f 100644 --- a/constants/std_constants.asm +++ b/constants/std_constants.asm @@ -1,5 +1,5 @@ ; StdScripts indexes (see engine/std_scripts.asm) -; also used in CheckFacingTileForStd (see main.asm) +; also used in TileCollisionStdScripts (see data/collision_stdscripts.asm) enum_start enum pokecenternurse enum difficultbookshelf diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 49a0df454..f2fb72714 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -1,11 +1,17 @@ +trainerclass: MACRO + enum \1 +const_value = 1 +ENDM + ; trainer class ids ; `trainerclass` indexes are for: -; - TrainerClassAttributes (see trainers/attributes.asm) -; - TrainerClassDVs (see trainers/dvs.asm) -; - TrainerEncounterMusic (see trainers/encounter_music.asm) -; - TrainerGroups (see trainers/trainer_pointers.asm) -; - BTTrainerClassGenders (see misc/battle_tower_47.asm) -; trainer constants are Trainers indexes, for the sub-tables of TrainerGroups (see trainers/trainers.asm) +; - TrainerClassAttributes (see data/trainers/trainer_attributes.asm) +; - TrainerClassDVs (see data/trainers/trainer_dvs.asm) +; - TrainerClassNames (see data/trainers/trainer_class_names.asm) +; - TrainerEncounterMusic (see data/trainers/encounter_music.asm) +; - TrainerGroups (see data/trainers/party_pointers.asm) +; - BTTrainerClassGenders (see data/trainers/gendered_trainers.asm) +; trainer constants are Trainers indexes, for the sub-tables of TrainerGroups (see data/trainers/parties.asm) enum_start CHRIS EQU __enum__ trainerclass TRAINER_NONE ; 0 @@ -672,7 +678,7 @@ KRIS EQU __enum__ NUM_TRAINER_CLASSES EQU __enum__ -; TrainerClassAttributes fields (see trainers/attributes.asm) +; TrainerClassAttributes fields (see data/trainers/trainer_attributes.asm) const_def const TRNATTR_ITEM1 const TRNATTR_ITEM2 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 23692fdef..c8c49621e 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -107,7 +107,7 @@ REGISTERED_NUMBER EQU %00111111 ; PlayerState: ; d95d PLAYER_NORMAL EQU 0 PLAYER_BIKE EQU 1 -PLAYER_SLIP EQU 2 +PLAYER_SKATE EQU 2 PLAYER_SURF EQU 4 PLAYER_SURF_PIKA EQU 8 diff --git a/data/base_stats.asm b/data/base_stats.asm deleted file mode 100644 index 808a996a6..000000000 --- a/data/base_stats.asm +++ /dev/null @@ -1,252 +0,0 @@ -BaseData:: -INCLUDE "data/base_stats/bulbasaur.asm" -INCLUDE "data/base_stats/ivysaur.asm" -INCLUDE "data/base_stats/venusaur.asm" -INCLUDE "data/base_stats/charmander.asm" -INCLUDE "data/base_stats/charmeleon.asm" -INCLUDE "data/base_stats/charizard.asm" -INCLUDE "data/base_stats/squirtle.asm" -INCLUDE "data/base_stats/wartortle.asm" -INCLUDE "data/base_stats/blastoise.asm" -INCLUDE "data/base_stats/caterpie.asm" -INCLUDE "data/base_stats/metapod.asm" -INCLUDE "data/base_stats/butterfree.asm" -INCLUDE "data/base_stats/weedle.asm" -INCLUDE "data/base_stats/kakuna.asm" -INCLUDE "data/base_stats/beedrill.asm" -INCLUDE "data/base_stats/pidgey.asm" -INCLUDE "data/base_stats/pidgeotto.asm" -INCLUDE "data/base_stats/pidgeot.asm" -INCLUDE "data/base_stats/rattata.asm" -INCLUDE "data/base_stats/raticate.asm" -INCLUDE "data/base_stats/spearow.asm" -INCLUDE "data/base_stats/fearow.asm" -INCLUDE "data/base_stats/ekans.asm" -INCLUDE "data/base_stats/arbok.asm" -INCLUDE "data/base_stats/pikachu.asm" -INCLUDE "data/base_stats/raichu.asm" -INCLUDE "data/base_stats/sandshrew.asm" -INCLUDE "data/base_stats/sandslash.asm" -INCLUDE "data/base_stats/nidoran_f.asm" -INCLUDE "data/base_stats/nidorina.asm" -INCLUDE "data/base_stats/nidoqueen.asm" -INCLUDE "data/base_stats/nidoran_m.asm" -INCLUDE "data/base_stats/nidorino.asm" -INCLUDE "data/base_stats/nidoking.asm" -INCLUDE "data/base_stats/clefairy.asm" -INCLUDE "data/base_stats/clefable.asm" -INCLUDE "data/base_stats/vulpix.asm" -INCLUDE "data/base_stats/ninetales.asm" -INCLUDE "data/base_stats/jigglypuff.asm" -INCLUDE "data/base_stats/wigglytuff.asm" -INCLUDE "data/base_stats/zubat.asm" -INCLUDE "data/base_stats/golbat.asm" -INCLUDE "data/base_stats/oddish.asm" -INCLUDE "data/base_stats/gloom.asm" -INCLUDE "data/base_stats/vileplume.asm" -INCLUDE "data/base_stats/paras.asm" -INCLUDE "data/base_stats/parasect.asm" -INCLUDE "data/base_stats/venonat.asm" -INCLUDE "data/base_stats/venomoth.asm" -INCLUDE "data/base_stats/diglett.asm" -INCLUDE "data/base_stats/dugtrio.asm" -INCLUDE "data/base_stats/meowth.asm" -INCLUDE "data/base_stats/persian.asm" -INCLUDE "data/base_stats/psyduck.asm" -INCLUDE "data/base_stats/golduck.asm" -INCLUDE "data/base_stats/mankey.asm" -INCLUDE "data/base_stats/primeape.asm" -INCLUDE "data/base_stats/growlithe.asm" -INCLUDE "data/base_stats/arcanine.asm" -INCLUDE "data/base_stats/poliwag.asm" -INCLUDE "data/base_stats/poliwhirl.asm" -INCLUDE "data/base_stats/poliwrath.asm" -INCLUDE "data/base_stats/abra.asm" -INCLUDE "data/base_stats/kadabra.asm" -INCLUDE "data/base_stats/alakazam.asm" -INCLUDE "data/base_stats/machop.asm" -INCLUDE "data/base_stats/machoke.asm" -INCLUDE "data/base_stats/machamp.asm" -INCLUDE "data/base_stats/bellsprout.asm" -INCLUDE "data/base_stats/weepinbell.asm" -INCLUDE "data/base_stats/victreebel.asm" -INCLUDE "data/base_stats/tentacool.asm" -INCLUDE "data/base_stats/tentacruel.asm" -INCLUDE "data/base_stats/geodude.asm" -INCLUDE "data/base_stats/graveler.asm" -INCLUDE "data/base_stats/golem.asm" -INCLUDE "data/base_stats/ponyta.asm" -INCLUDE "data/base_stats/rapidash.asm" -INCLUDE "data/base_stats/slowpoke.asm" -INCLUDE "data/base_stats/slowbro.asm" -INCLUDE "data/base_stats/magnemite.asm" -INCLUDE "data/base_stats/magneton.asm" -INCLUDE "data/base_stats/farfetch_d.asm" -INCLUDE "data/base_stats/doduo.asm" -INCLUDE "data/base_stats/dodrio.asm" -INCLUDE "data/base_stats/seel.asm" -INCLUDE "data/base_stats/dewgong.asm" -INCLUDE "data/base_stats/grimer.asm" -INCLUDE "data/base_stats/muk.asm" -INCLUDE "data/base_stats/shellder.asm" -INCLUDE "data/base_stats/cloyster.asm" -INCLUDE "data/base_stats/gastly.asm" -INCLUDE "data/base_stats/haunter.asm" -INCLUDE "data/base_stats/gengar.asm" -INCLUDE "data/base_stats/onix.asm" -INCLUDE "data/base_stats/drowzee.asm" -INCLUDE "data/base_stats/hypno.asm" -INCLUDE "data/base_stats/krabby.asm" -INCLUDE "data/base_stats/kingler.asm" -INCLUDE "data/base_stats/voltorb.asm" -INCLUDE "data/base_stats/electrode.asm" -INCLUDE "data/base_stats/exeggcute.asm" -INCLUDE "data/base_stats/exeggutor.asm" -INCLUDE "data/base_stats/cubone.asm" -INCLUDE "data/base_stats/marowak.asm" -INCLUDE "data/base_stats/hitmonlee.asm" -INCLUDE "data/base_stats/hitmonchan.asm" -INCLUDE "data/base_stats/lickitung.asm" -INCLUDE "data/base_stats/koffing.asm" -INCLUDE "data/base_stats/weezing.asm" -INCLUDE "data/base_stats/rhyhorn.asm" -INCLUDE "data/base_stats/rhydon.asm" -INCLUDE "data/base_stats/chansey.asm" -INCLUDE "data/base_stats/tangela.asm" -INCLUDE "data/base_stats/kangaskhan.asm" -INCLUDE "data/base_stats/horsea.asm" -INCLUDE "data/base_stats/seadra.asm" -INCLUDE "data/base_stats/goldeen.asm" -INCLUDE "data/base_stats/seaking.asm" -INCLUDE "data/base_stats/staryu.asm" -INCLUDE "data/base_stats/starmie.asm" -INCLUDE "data/base_stats/mr__mime.asm" -INCLUDE "data/base_stats/scyther.asm" -INCLUDE "data/base_stats/jynx.asm" -INCLUDE "data/base_stats/electabuzz.asm" -INCLUDE "data/base_stats/magmar.asm" -INCLUDE "data/base_stats/pinsir.asm" -INCLUDE "data/base_stats/tauros.asm" -INCLUDE "data/base_stats/magikarp.asm" -INCLUDE "data/base_stats/gyarados.asm" -INCLUDE "data/base_stats/lapras.asm" -INCLUDE "data/base_stats/ditto.asm" -INCLUDE "data/base_stats/eevee.asm" -INCLUDE "data/base_stats/vaporeon.asm" -INCLUDE "data/base_stats/jolteon.asm" -INCLUDE "data/base_stats/flareon.asm" -INCLUDE "data/base_stats/porygon.asm" -INCLUDE "data/base_stats/omanyte.asm" -INCLUDE "data/base_stats/omastar.asm" -INCLUDE "data/base_stats/kabuto.asm" -INCLUDE "data/base_stats/kabutops.asm" -INCLUDE "data/base_stats/aerodactyl.asm" -INCLUDE "data/base_stats/snorlax.asm" -INCLUDE "data/base_stats/articuno.asm" -INCLUDE "data/base_stats/zapdos.asm" -INCLUDE "data/base_stats/moltres.asm" -INCLUDE "data/base_stats/dratini.asm" -INCLUDE "data/base_stats/dragonair.asm" -INCLUDE "data/base_stats/dragonite.asm" -INCLUDE "data/base_stats/mewtwo.asm" -INCLUDE "data/base_stats/mew.asm" -INCLUDE "data/base_stats/chikorita.asm" -INCLUDE "data/base_stats/bayleef.asm" -INCLUDE "data/base_stats/meganium.asm" -INCLUDE "data/base_stats/cyndaquil.asm" -INCLUDE "data/base_stats/quilava.asm" -INCLUDE "data/base_stats/typhlosion.asm" -INCLUDE "data/base_stats/totodile.asm" -INCLUDE "data/base_stats/croconaw.asm" -INCLUDE "data/base_stats/feraligatr.asm" -INCLUDE "data/base_stats/sentret.asm" -INCLUDE "data/base_stats/furret.asm" -INCLUDE "data/base_stats/hoothoot.asm" -INCLUDE "data/base_stats/noctowl.asm" -INCLUDE "data/base_stats/ledyba.asm" -INCLUDE "data/base_stats/ledian.asm" -INCLUDE "data/base_stats/spinarak.asm" -INCLUDE "data/base_stats/ariados.asm" -INCLUDE "data/base_stats/crobat.asm" -INCLUDE "data/base_stats/chinchou.asm" -INCLUDE "data/base_stats/lanturn.asm" -INCLUDE "data/base_stats/pichu.asm" -INCLUDE "data/base_stats/cleffa.asm" -INCLUDE "data/base_stats/igglybuff.asm" -INCLUDE "data/base_stats/togepi.asm" -INCLUDE "data/base_stats/togetic.asm" -INCLUDE "data/base_stats/natu.asm" -INCLUDE "data/base_stats/xatu.asm" -INCLUDE "data/base_stats/mareep.asm" -INCLUDE "data/base_stats/flaaffy.asm" -INCLUDE "data/base_stats/ampharos.asm" -INCLUDE "data/base_stats/bellossom.asm" -INCLUDE "data/base_stats/marill.asm" -INCLUDE "data/base_stats/azumarill.asm" -INCLUDE "data/base_stats/sudowoodo.asm" -INCLUDE "data/base_stats/politoed.asm" -INCLUDE "data/base_stats/hoppip.asm" -INCLUDE "data/base_stats/skiploom.asm" -INCLUDE "data/base_stats/jumpluff.asm" -INCLUDE "data/base_stats/aipom.asm" -INCLUDE "data/base_stats/sunkern.asm" -INCLUDE "data/base_stats/sunflora.asm" -INCLUDE "data/base_stats/yanma.asm" -INCLUDE "data/base_stats/wooper.asm" -INCLUDE "data/base_stats/quagsire.asm" -INCLUDE "data/base_stats/espeon.asm" -INCLUDE "data/base_stats/umbreon.asm" -INCLUDE "data/base_stats/murkrow.asm" -INCLUDE "data/base_stats/slowking.asm" -INCLUDE "data/base_stats/misdreavus.asm" -INCLUDE "data/base_stats/unown.asm" -INCLUDE "data/base_stats/wobbuffet.asm" -INCLUDE "data/base_stats/girafarig.asm" -INCLUDE "data/base_stats/pineco.asm" -INCLUDE "data/base_stats/forretress.asm" -INCLUDE "data/base_stats/dunsparce.asm" -INCLUDE "data/base_stats/gligar.asm" -INCLUDE "data/base_stats/steelix.asm" -INCLUDE "data/base_stats/snubbull.asm" -INCLUDE "data/base_stats/granbull.asm" -INCLUDE "data/base_stats/qwilfish.asm" -INCLUDE "data/base_stats/scizor.asm" -INCLUDE "data/base_stats/shuckle.asm" -INCLUDE "data/base_stats/heracross.asm" -INCLUDE "data/base_stats/sneasel.asm" -INCLUDE "data/base_stats/teddiursa.asm" -INCLUDE "data/base_stats/ursaring.asm" -INCLUDE "data/base_stats/slugma.asm" -INCLUDE "data/base_stats/magcargo.asm" -INCLUDE "data/base_stats/swinub.asm" -INCLUDE "data/base_stats/piloswine.asm" -INCLUDE "data/base_stats/corsola.asm" -INCLUDE "data/base_stats/remoraid.asm" -INCLUDE "data/base_stats/octillery.asm" -INCLUDE "data/base_stats/delibird.asm" -INCLUDE "data/base_stats/mantine.asm" -INCLUDE "data/base_stats/skarmory.asm" -INCLUDE "data/base_stats/houndour.asm" -INCLUDE "data/base_stats/houndoom.asm" -INCLUDE "data/base_stats/kingdra.asm" -INCLUDE "data/base_stats/phanpy.asm" -INCLUDE "data/base_stats/donphan.asm" -INCLUDE "data/base_stats/porygon2.asm" -INCLUDE "data/base_stats/stantler.asm" -INCLUDE "data/base_stats/smeargle.asm" -INCLUDE "data/base_stats/tyrogue.asm" -INCLUDE "data/base_stats/hitmontop.asm" -INCLUDE "data/base_stats/smoochum.asm" -INCLUDE "data/base_stats/elekid.asm" -INCLUDE "data/base_stats/magby.asm" -INCLUDE "data/base_stats/miltank.asm" -INCLUDE "data/base_stats/blissey.asm" -INCLUDE "data/base_stats/raikou.asm" -INCLUDE "data/base_stats/entei.asm" -INCLUDE "data/base_stats/suicune.asm" -INCLUDE "data/base_stats/larvitar.asm" -INCLUDE "data/base_stats/pupitar.asm" -INCLUDE "data/base_stats/tyranitar.asm" -INCLUDE "data/base_stats/lugia.asm" -INCLUDE "data/base_stats/ho_oh.asm" -INCLUDE "data/base_stats/celebi.asm" diff --git a/data/ball_colors.asm b/data/battle/ball_colors.asm similarity index 100% rename from data/ball_colors.asm rename to data/battle/ball_colors.asm diff --git a/data/battle/flee_mons.asm b/data/battle/flee_mons.asm new file mode 100644 index 000000000..1b1cea036 --- /dev/null +++ b/data/battle/flee_mons.asm @@ -0,0 +1,36 @@ +FleeMons: +; referenced by TryEnemyFlee and FastBallMultiplier + +SometimesFleeMons: ; 3c59a + db MAGNEMITE + db GRIMER + db TANGELA + db MR__MIME + db EEVEE + db PORYGON + db DRATINI + db DRAGONAIR + db TOGETIC + db UMBREON + db UNOWN + db SNUBBULL + db HERACROSS + db -1 + +OftenFleeMons: ; 3c5a8 + db CUBONE + db ARTICUNO + db ZAPDOS + db MOLTRES + db QUAGSIRE + db DELIBIRD + db PHANPY + db TEDDIURSA + db -1 + +AlwaysFleeMons: ; 3c5b1 + db RAIKOU + db ENTEI +; db SUICUNE + db -1 +; 3c5b4 diff --git a/data/battle_tower.asm b/data/battle_tower.asm index 2c78ffb82..d2e07fac3 100644 --- a/data/battle_tower.asm +++ b/data/battle_tower.asm @@ -1,7 +1,7 @@ BattleTowerTrainers: ; 1f814e ; The trainer class is not used in Crystal 1.0 due to a bug. ; Instead, the sixth character in the trainer's name is used. -; See misc/battle_tower_47.asm +; See mobile/battle_tower_47.asm db "HANSON@@@@", FISHER db "SAWYER@@@@", POKEMANIAC db "MASUDA@@@@", GUITARIST diff --git a/data/credits_script.asm b/data/credits_script.asm new file mode 100644 index 000000000..810e61c83 --- /dev/null +++ b/data/credits_script.asm @@ -0,0 +1,287 @@ +CreditsScript: ; 10acb4 + +; Clear the banner. + db CREDITS_CLEAR + +; Pokemon Crystal Version Staff + db STAFF, 1 + + db CREDITS_WAIT, 8 + +; Play the credits music. + db CREDITS_MUSIC + + db CREDITS_WAIT2, 10 + + db CREDITS_WAIT, 1 + +; Update the banner. + db CREDITS_SCENE, 0 ; Pichu + + db DIRECTOR, 1 + db SATOSHI_TAJIRI, 2 + + db CREDITS_WAIT, 12 + + db CODIRECTOR, 1 + db JUNICHI_MASUDA, 2 + + db CREDITS_WAIT, 12 + + db PROGRAMMERS, 0 + db SOUSUKE_TAMADA, 1 + db HISASHI_SOGABE, 2 + db KEITA_KAGAYA, 3 + db YOSHINORI_MATSUDA, 4 + + db CREDITS_WAIT, 12 + + db PROGRAMMERS, 0 + db SHIGEKI_MORIMOTO, 1 + db TETSUYA_WATANABE, 2 + db TAKENORI_OOTA, 3 + + db CREDITS_WAIT, 12 + + db GRAPHICS_DIRECTOR, 1 + db KEN_SUGIMORI, 2 + + db CREDITS_WAIT, 12 + + db MONSTER_DESIGN, 0 + db KEN_SUGIMORI, 1 + db MOTOFUMI_FUJIWARA, 2 + db SHIGEKI_MORIMOTO, 3 + db HIRONOBU_YOSHIDA, 4 + db SATOSHI_OOTA, 5 + + db CREDITS_WAIT, 12 + + db MONSTER_DESIGN, 0 + db ATSUKO_NISHIDA, 1 + db MUNEO_SAITO, 2 + db RENA_YOSHIKAWA, 3 + + db CREDITS_WAIT, 12 + + db POKEMON_ANIMATION, 1 + db HIRONOBU_YOSHIDA, 2 + db JUN_OKUTANI, 3 + + db CREDITS_WAIT, 12 + +; Clear the banner. + db CREDITS_CLEAR + + db CREDITS_WAIT, 1 + +; Update the banner. + db CREDITS_SCENE, 1 ; Smoochum + + db GRAPHICS_DESIGN, 0 + db HIRONOBU_YOSHIDA, 1 + db JUN_OKUTANI, 2 + db ASUKA_IWASHITA, 3 + db TETSUYA_WATANABE, 4 + + db CREDITS_WAIT, 12 + + db CREDIT_MUSIC, 0 + db JUNICHI_MASUDA, 1 + db MORIKAZU_AOKI, 2 + db GO_ICHINOSE, 3 + + db CREDITS_WAIT, 12 + + db CREDIT_SOUND_EFFECTS, 0 + db MORIKAZU_AOKI, 1 + db JUNICHI_MASUDA, 2 + db TETSUYA_WATANABE, 3 + + db CREDITS_WAIT, 12 + + db GAME_DESIGN, 0 + db JUNICHI_MASUDA, 1 + db SHIGEKI_MORIMOTO, 2 + db KOHJI_NISHINO, 3 + + db CREDITS_WAIT, 12 + + db GAME_DESIGN, 0 + db TETSUJI_OOTA, 1 + db HITOMI_SATO, 2 + db KENJI_MATSUSHIMA, 3 + + db CREDITS_WAIT, 12 + + db GAME_SCENARIO, 0 + db JUNICHI_MASUDA, 1 + db KOHJI_NISHINO, 2 + db TOSHINOBU_MATSUMIYA, 3 + db KENJI_MATSUSHIMA, 4 + + db CREDITS_WAIT, 12 + + db POKEDEX_TEXT, 1 + db TOSHINOBU_MATSUMIYA, 2 + + db CREDITS_WAIT, 12 + + db TOOL_PROGRAMMING, 1 + db SOUSUKE_TAMADA, 2 + db TAKENORI_OOTA, 3 + + db CREDITS_WAIT, 12 + + db PARAMETRIC_DESIGN, 1 + db KOHJI_NISHINO, 2 + + db CREDITS_WAIT, 12 + +; Clear the banner. + db CREDITS_CLEAR + + db CREDITS_WAIT, 1 + +; Update the banner. + db CREDITS_SCENE, 2 ; Ditto + + db SCRIPT_DESIGN, 1 + db TETSUJI_OOTA, 2 + db NOBUHIRO_SEYA, 3 + + db CREDITS_WAIT, 12 + + db MAP_DATA_DESIGN, 1 + db TETSUJI_OOTA, 2 + db KAZUHITO_SEKINE, 3 + + db CREDITS_WAIT, 12 + + db MAP_DESIGN, 0 + db TETSUJI_OOTA, 1 + db KOHJI_NISHINO, 2 + db NOBUHIRO_SEYA, 3 + + db CREDITS_WAIT, 12 + + db COORDINATION, 1 + db HIROYUKI_ZINNAI, 2 + + db CREDITS_WAIT, 12 + + db PRODUCERS, 0 + db SATORU_IWATA, 1 + db SATOSHI_YAMATO, 2 + db SHIGERU_MIYAMOTO, 3 + + db CREDITS_WAIT, 12 + + db PRODUCERS, 1 + db TSUNEKAZU_ISHIHARA, 2 + + db CREDITS_WAIT, 12 + +; Clear the banner. + db CREDITS_CLEAR + + db CREDITS_WAIT, 1 + +; Update the banner. + db CREDITS_SCENE, 3 ; Igglybuff + + db US_VERSION_STAFF, 2 + + db CREDITS_WAIT, 9 + + db US_COORDINATION, 1 + db GAIL_TILDEN, 2 + db HIRO_NAKAMURA, 3 + + db CREDITS_WAIT, 12 + + db US_COORDINATION, 1 + db JUNICHI_MASUDA, 2 + db SETH_MCMAHILL, 3 + + db CREDITS_WAIT, 12 + + db US_COORDINATION, 1 + db HIROTO_ALEXANDER, 2 + db TERESA_LILLYGREN, 3 + + db CREDITS_WAIT, 12 + + db TEXT_TRANSLATION, 1 + db NOB_OGASAWARA, 2 + + db CREDITS_WAIT, 12 + + db PROGRAMMERS, 1 + db TERUKI_MURAKAWA, 2 + db KAZUYOSHI_OSAWA, 3 + + db CREDITS_WAIT, 12 + + db PAAD_TESTING, 1 + db THOMAS_HERTZOG, 2 + db ERIK_JOHNSON, 3 + + db CREDITS_WAIT, 12 + + db PRODUCT_TESTING, 0 + db PLANNING, 1 + + db CREDITS_WAIT, 12 + + db PRODUCT_TESTING, 0 + db KEITA_NAKAMURA, 1 + db HIROTAKA_UEMURA, 2 + db HIROAKI_TAMURA, 3 + db NORIAKI_SAKAGUCHI, 4 + + db CREDITS_WAIT, 12 + + db PRODUCT_TESTING, 0 + db NCL_SUPER_MARIO_CLUB, 1 + db KENJI_SAIKI, 2 + db ATSUSHI_TADA, 3 + db MIYUKI_SATO, 4 + + db CREDITS_WAIT, 12 + + db SPECIAL_THANKS, 0 + db KIMIKO_NAKAMICHI, 1 + db AKITO_MORI, 2 + + db CREDITS_WAIT, 12 + + db SPECIAL_THANKS, 0 + db GAKUZI_NOMOTO, 1 + db AI_MASHIMA, 2 + db KUNIMI_KAWAMURA, 3 + + db CREDITS_WAIT, 12 + + db SPECIAL_THANKS, 0 + db MIKIHIRO_ISHIKAWA, 1 + db HIDEYUKI_HASHIMOTO, 2 + + db CREDITS_WAIT, 12 + + db EXECUTIVE_PRODUCER, 1 + db HIROSHI_YAMAUCHI, 2 + + db CREDITS_WAIT, 12 + + db COPYRIGHT, 1 + + db CREDITS_WAIT, 9 + +; Display "The End" graphic. + db CREDITS_THEEND + + db CREDITS_WAIT, 20 + + db CREDITS_END +; 10ae13 diff --git a/data/credits_strings.asm b/data/credits_strings.asm new file mode 100644 index 000000000..f885e2152 --- /dev/null +++ b/data/credits_strings.asm @@ -0,0 +1,221 @@ +CreditsStrings: +; entries correspond to constants/credits_constants.asm + dw .SatoshiTajiri + dw .JunichiMasuda + dw .TetsuyaWatanabe + dw .ShigekiMorimoto + dw .SousukeTamada + dw .TakenoriOota + dw .KenSugimori + dw .MotofumiFujiwara + dw .AtsukoNishida + dw .MuneoSaito + dw .SatoshiOota + dw .RenaYoshikawa + dw .JunOkutani + dw .HironobuYoshida + dw .AsukaIwashita + dw .GoIchinose + dw .MorikazuAoki + dw .KohjiNishino + dw .KenjiMatsushima + dw .ToshinobuMatsumiya + dw .SatoruIwata + dw .NobuhiroSeya + dw .KazuhitoSekine + dw .TetsujiOota + dw .NclSuperMarioClub + dw .Sarugakucho + dw .AkitoMori + dw .TakahiroHarada + dw .TohruHashimoto + dw .NoboruMatsumoto + dw .TakehiroIzushi + dw .TakashiKawaguchi + dw .TsunekazuIshihara + dw .HiroshiYamauchi + dw .KenjiSaiki + dw .AtsushiTada + dw .NaokoKawakami + dw .HiroyukiZinnai + dw .KunimiKawamura + dw .HisashiSogabe + dw .KeitaKagaya + dw .YoshinoriMatsuda + dw .HitomiSato + dw .ToruOsawa + dw .TakaoOhara + dw .YuichiroIto + dw .TakaoShimizu + dw .Planning + dw .KeitaNakamura + dw .HirotakaUemura + dw .HiroakiTamura + dw .NoriakiSakaguchi + dw .MiyukiSato + dw .GakuziNomoto + dw .AiMashima + dw .MikihiroIshikawa + dw .HideyukiHashimoto + dw .SatoshiYamato + dw .ShigeruMiyamoto + dw .GailTilden + dw .NobOgasawara + dw .SethMcMahill + dw .HirotoAlexander + dw .TeresaLillygren + dw .ThomasHertzog + dw .ErikJohnson + dw .HiroNakamura + dw .TerukiMurakawa + dw .KazuyoshiOsawa + dw .KimikoNakamichi + dw .End + dw .Unknown + dw .Staff + dw .Director + dw .CoDirector + dw .Programmers + dw .GraphicsDirector + dw .MonsterDesign + dw .GraphicsDesign + dw .Music + dw .SoundEffects + dw .GameDesign + dw .GameScenario + dw .ToolProgramming + dw .ParametricDesign + dw .ScriptDesign + dw .MapDataDesign + dw .MapDesign + dw .ProductTesting + dw .SpecialThanks + dw .Producers + dw .ExecutiveProducer + dw .PokemonAnimation + dw .PokedexText + dw .MobilePrjLeader + dw .MobileSystemAd + dw .MobileStadiumDir + dw .Coordination + dw .Copyright + dw .UsVersionStaff + dw .UsCoordination + dw .TextTranslation + dw .PaadTesting + +.SatoshiTajiri: db " SATOSHI TAJIRI@" ; "たじり さとし@" +.JunichiMasuda: db " JUNICHI MASUDA@" ; "ますだ じゅんいち@" +.TetsuyaWatanabe: db " TETSUYA WATANABE@" ; "わたなべ てつや@" +.ShigekiMorimoto: db " SHIGEKI MORIMOTO@" ; "もりもと しげき@" +.SousukeTamada: db " SOUSUKE TAMADA@" ; "たまだ そうすけ@" +.TakenoriOota: db " TAKENORI OOTA@" ; "おおた たけのり@" +.KenSugimori: db " KEN SUGIMORI@" ; "すぎもり けん@" +.MotofumiFujiwara: db " MOTOFUMI FUJIWARA@" ; "ふじわら もとふみ@" +.AtsukoNishida: db " ATSUKO NISHIDA@" ; "にしだ あつこ@" +.MuneoSaito: db " MUNEO SAITO@" ; "さいとう むねお@" +.SatoshiOota: db " SATOSHI OOTA@" ; "おおた さとし@" +.RenaYoshikawa: db " RENA YOSHIKAWA@" ; "よしかわ れな@" +.JunOkutani: db " JUN OKUTANI@" ; "おくたに じゅん@" +.HironobuYoshida: db " HIRONOBU YOSHIDA@" ; "よしだ ひろのぶ@" +.AsukaIwashita: db " ASUKA IWASHITA@" ; "いわした あすか@" +.GoIchinose: db " GO ICHINOSE@" ; "いちのせ ごう@" +.MorikazuAoki: db " MORIKAZU AOKI@" ; "あおき もりかず@" +.KohjiNishino: db " KOHJI NISHINO@" ; "にしの こうじ@" +.KenjiMatsushima: db " KENJI MATSUSHIMA@" ; "まつしま けんじ@" +.ToshinobuMatsumiya: db "TOSHINOBU MATSUMIYA@" ; "まつみや としのぶ@" +.SatoruIwata: db " SATORU IWATA@" ; "いわた さとる@" +.NobuhiroSeya: db " NOBUHIRO SEYA@" ; "せや のぶひろ@" +.KazuhitoSekine: db " KAZUHITO SEKINE@" ; "せきね かずひと@" +.TetsujiOota: db " TETSUJI OOTA@" ; "おおた てつじ@" +.NclSuperMarioClub: db "NCL SUPER MARIO CLUB@" ; "スーパーマりォクラブ@" +.Sarugakucho: db " SARUGAKUCHO@" ; "さるがくちょう@" +.AkitoMori: db " AKITO MORI@" ; "もり あきと@" +.TakahiroHarada: db " TAKAHIRO HARADA@" ; "はらだ たかひろ@" +.TohruHashimoto: db " TOHRU HASHIMOTO@" ; "はしもと とおる@" +.NoboruMatsumoto: db " NOBORU MATSUMOTO@" ; "まつもと のぼる@" +.TakehiroIzushi: db " TAKEHIRO IZUSHI@" ; "いずし たけひろ@" +.TakashiKawaguchi: db " TAKASHI KAWAGUCHI@" ; "かわぐち たかし@" +.TsunekazuIshihara: db " TSUNEKAZU ISHIHARA@" ; "いしはら つねかず@" +.HiroshiYamauchi: db " HIROSHI YAMAUCHI@" ; "やまうち ひろし@" +.KenjiSaiki: db " KENJI SAIKI@" ; "さいき けんじ@" +.AtsushiTada: db " ATSUSHI TADA@" ; "ただ あつし@" +.NaokoKawakami: db " NAOKO KAWAKAMI@" ; "かわかみ なおこ@" +.HiroyukiZinnai: db " HIROYUKI ZINNAI@" ; "じんない ひろゆき@" +.KunimiKawamura: db " KUNIMI KAWAMURA@" ; "かわむら くにみ@" +.HisashiSogabe: db " HISASHI SOGABE@" ; "そがべ ひさし@" +.KeitaKagaya: db " KEITA KAGAYA@" ; "かがや けいた@" +.YoshinoriMatsuda: db " YOSHINORI MATSUDA@" ; "まつだ よしのり@" +.HitomiSato: db " HITOMI SATO@" ; "さとう ひとみ@" +.ToruOsawa: db " TORU OSAWA@" ; "おおさわ とおる@" +.TakaoOhara: db " TAKAO OHARA@" ; "おおはら たかお@" +.YuichiroIto: db " YUICHIRO ITO@" ; "いとう ゆういちろう@" +.TakaoShimizu: db " TAKAO SHIMIZU@" ; "しみず たかお@" +.Planning: db " SPECIAL PRODUCTION" + next " PLANNING" ; "きかくかいはつぶ@" + next " & DEVELOPMENT DEPT.@" +.KeitaNakamura: db " KEITA NAKAMURA@" ; "なかむら けいた@" +.HirotakaUemura: db " HIROTAKA UEMURA@" ; "うえむら ひろたか@" +.HiroakiTamura: db " HIROAKI TAMURA@" ; "たむら ひろあき@" +.NoriakiSakaguchi: db " NORIAKI SAKAGUCHI@" ; "さかぐち のりあき@" +.MiyukiSato: db " MIYUKI SATO@" ; "さとう みゆき@" +.GakuziNomoto: db " GAKUZI NOMOTO@" ; "のもと がくじ@" +.AiMashima: db " AI MASHIMA@" ; "ましま あい@" +.MikihiroIshikawa: db " MIKIHIRO ISHIKAWA@" ; "いしかわ みきひろ@" +.HideyukiHashimoto: db " HIDEYUKI HASHIMOTO@" ; "はしもと ひでゆき@" +.SatoshiYamato: db " SATOSHI YAMATO@" ; "やまと さとし@" +.ShigeruMiyamoto: db " SHIGERU MIYAMOTO@" ; "みやもと しげる@" +.End: db " END@" ; "おしまい@" +.Unknown: db " ????????@" ; "????????@" +.GailTilden: db " GAIL TILDEN@" +.NobOgasawara: db " NOB OGASAWARA@" +.SethMcMahill: db " SETH McMAHILL@" +.HirotoAlexander: db " HIROTO ALEXANDER@" +.TeresaLillygren: db " TERESA LILLYGREN@" +.ThomasHertzog: db " THOMAS HERTZOG@" +.ErikJohnson: db " ERIK JOHNSON@" +.HiroNakamura: db " HIRO NAKAMURA@" +.TerukiMurakawa: db " TERUKI MURAKAWA@" +.KazuyoshiOsawa: db " KAZUYOSHI OSAWA@" +.KimikoNakamichi: db " KIMIKO NAKAMICHI@" +.Staff: db " #MON" ; "ポケットモンスター" + next " CRYSTAL VERSION" ; " クりスタル バージョン" + next " STAFF@" ; " スタッフ@" +.Director: db " DIRECTOR@" ; "エグゼクティブ ディレクター@" +.CoDirector: db " CO-DIRECTOR@" ; "ディレクター@" +.Programmers: db " PROGRAMMERS@" ; "プログラム@" +.GraphicsDirector: db " GRAPHICS DIRECTOR@" ; "グラフィック ディレクター@" +.MonsterDesign: db " MONSTER DESIGN@" ; "# デザイン@" +.GraphicsDesign: db " GRAPHICS DESIGN@" ; "グラフィック デザイン@" +.Music: db " MUSIC@" ; "おんがく@" +.SoundEffects: db " SOUND EFFECTS@" ; "サウンド エフ→クト@" +.GameDesign: db " GAME DESIGN@" ; "ゲームデザイン@" +.GameScenario: db " GAME SCENARIO@" ; "シナりォ@" +.ToolProgramming: db " TOOL PROGRAMMING@" ; "ツール プログラム@" +.ParametricDesign: db " PARAMETRIC DESIGN@" ; "パラメーター せってい@" +.ScriptDesign: db " SCRIPT DESIGN@" ; "スクりプト せってい@" +.MapDataDesign: db " MAP DATA DESIGN@" ; "マップデータ せってい@" +.MapDesign: db " MAP DESIGN@" ; "マップ デザイン@" +.ProductTesting: db " PRODUCT TESTING@" ; "デバッグプレイ@" +.SpecialThanks: db " SPECIAL THANKS@" ; "スぺシャルサンクス@" +.Producers: db " PRODUCERS@" ; "プロデューサー@" +.ExecutiveProducer: db " EXECUTIVE PRODUCER@" ; "エグゼクティブ プロデューサー@" +.PokemonAnimation: db " #MON ANIMATION@" ; "# アニメーション@" +.PokedexText: db " #DEX TEXT@" ; "ずかん テキスト@" +.MobilePrjLeader: db " MOBILE PRJ. LEADER@" ; "モバイルプロジ→クト りーダー@" +.MobileSystemAd: db " MOBILE SYSTEM AD.@" ; "モバイル システムアドバイザー@" +.MobileStadiumDir: db "MOBILE STADIUM DIR.@" ; "モバイルスタジアム ディレクター@" +.Coordination: db " COORDINATION@" ; "コーディネーター@" +.UsVersionStaff: db " US VERSION STAFF@" +.UsCoordination: db " US COORDINATION@" +.TextTranslation: db " TEXT TRANSLATION@" +.PaadTesting: db " PAAD TESTING@" + +.Copyright: + ; (C) 1 9 9 5 - 2 0 0 1 N i n t e n d o + db $60,$61,$62,$63,$64,$65,$66,$67,$68,$69,$6a,$6b,$6c + ; (C) 1 9 9 5 - 2 0 0 1 C r e a t u r e s i n c . + next $60,$61,$62,$63,$64,$65,$66,$6d,$6e,$6f,$70,$71,$72, $7a,$7b,$7c + ; (C) 1 9 9 5 - 2 0 0 1 G A M E F R E A K i n c . + next $60,$61,$62,$63,$64,$65,$66,$73,$74,$75,$76,$77,$78,$79, $7a,$7b,$7c + db "@" diff --git a/data/flypoints.asm b/data/flypoints.asm new file mode 100644 index 000000000..b41db0ea1 --- /dev/null +++ b/data/flypoints.asm @@ -0,0 +1,38 @@ +flypoint: MACRO + const FLY_\1 + db \2, SPAWN_\1 +ENDM + +Flypoints: ; 91c5e +; landmark, spawn point + const_def +; Johto + flypoint NEW_BARK, NEW_BARK_TOWN + flypoint CHERRYGROVE, CHERRYGROVE_CITY + flypoint VIOLET, VIOLET_CITY + flypoint AZALEA, AZALEA_TOWN + flypoint GOLDENROD, GOLDENROD_CITY + flypoint ECRUTEAK, ECRUTEAK_CITY + flypoint OLIVINE, OLIVINE_CITY + flypoint CIANWOOD, CIANWOOD_CITY + flypoint MAHOGANY, MAHOGANY_TOWN + flypoint LAKE, LAKE_OF_RAGE + flypoint BLACKTHORN, BLACKTHORN_CITY + flypoint MT_SILVER, SILVER_CAVE + +; Kanto +KANTO_FLYPOINT EQU const_value + flypoint PALLET, PALLET_TOWN + flypoint VIRIDIAN, VIRIDIAN_CITY + flypoint PEWTER, PEWTER_CITY + flypoint CERULEAN, CERULEAN_CITY + flypoint VERMILION, VERMILION_CITY + flypoint ROCK_TUNNEL, ROCK_TUNNEL + flypoint LAVENDER, LAVENDER_TOWN + flypoint CELADON, CELADON_CITY + flypoint SAFFRON, SAFFRON_CITY + flypoint FUCHSIA, FUCHSIA_CITY + flypoint CINNABAR, CINNABAR_ISLAND + flypoint INDIGO, INDIGO_PLATEAU + db -1 +; 91c8f diff --git a/data/hm_moves.asm b/data/hm_moves.asm deleted file mode 100644 index ac9f1f542..000000000 --- a/data/hm_moves.asm +++ /dev/null @@ -1,12 +0,0 @@ -; HM moves can't be forgotten - -HMMoves: ; 34f0 - db CUT - db FLY - db SURF - db STRENGTH - db FLASH - db WATERFALL - db WHIRLPOOL - db -1 ; end -; 34f8 diff --git a/data/items/bargain_shop.asm b/data/items/bargain_shop.asm new file mode 100644 index 000000000..e4da96210 --- /dev/null +++ b/data/items/bargain_shop.asm @@ -0,0 +1,9 @@ +BargainShopData: ; 15c51 + db 5 + dbw NUGGET, 4500 + dbw PEARL, 650 + dbw BIG_PEARL, 3500 + dbw STARDUST, 900 + dbw STAR_PIECE, 4600 + db -1 +; 15c62 diff --git a/data/items/buena_prizes.asm b/data/items/buena_prizes.asm new file mode 100644 index 000000000..8aecf2bd0 --- /dev/null +++ b/data/items/buena_prizes.asm @@ -0,0 +1,13 @@ +BuenaPrizeItems: ; 8b15e +; there are NUM_BUENA_PRIZES items (see event/buena.asm) + 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 +BuenaPrizeItemsEnd: +; 8b170 diff --git a/data/fruit_tree_items.asm b/data/items/fruit_trees.asm similarity index 100% rename from data/fruit_tree_items.asm rename to data/items/fruit_trees.asm diff --git a/items/item_attributes.asm b/data/items/item_attributes.asm similarity index 100% rename from items/item_attributes.asm rename to data/items/item_attributes.asm diff --git a/items/item_descriptions.asm b/data/items/item_descriptions.asm similarity index 100% rename from items/item_descriptions.asm rename to data/items/item_descriptions.asm diff --git a/items/item_names.asm b/data/items/item_names.asm similarity index 100% rename from items/item_names.asm rename to data/items/item_names.asm diff --git a/items/marts.asm b/data/items/marts.asm similarity index 100% rename from items/marts.asm rename to data/items/marts.asm diff --git a/data/mom_phone_items.asm b/data/items/mom_phone.asm similarity index 100% rename from data/mom_phone_items.asm rename to data/items/mom_phone.asm diff --git a/data/items/rooftop_sale.asm b/data/items/rooftop_sale.asm new file mode 100644 index 000000000..b16724cdc --- /dev/null +++ b/data/items/rooftop_sale.asm @@ -0,0 +1,18 @@ +RooftopSaleData1: ; 15aee + db 5 + dbw POKE_BALL, 150 + dbw GREAT_BALL, 500 + dbw SUPER_POTION, 500 + dbw FULL_HEAL, 500 + dbw REVIVE, 1200 + db -1 + +RooftopSaleData2: ; 15aff + db 5 + dbw HYPER_POTION, 1000 + dbw FULL_RESTORE, 2000 + dbw FULL_HEAL, 500 + dbw ULTRA_BALL, 1000 + dbw PROTEIN, 7800 + db -1 +; 15b10 diff --git a/data/landmarks.asm b/data/maps/landmarks.asm similarity index 100% rename from data/landmarks.asm rename to data/maps/landmarks.asm diff --git a/data/map_triggers.asm b/data/maps/map_triggers.asm similarity index 100% rename from data/map_triggers.asm rename to data/maps/map_triggers.asm diff --git a/data/mapgroup_roofs.asm b/data/maps/mapgroup_roofs.asm similarity index 100% rename from data/mapgroup_roofs.asm rename to data/maps/mapgroup_roofs.asm diff --git a/data/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm similarity index 100% rename from data/outdoor_sprites.asm rename to data/maps/outdoor_sprites.asm diff --git a/data/spawn_points.asm b/data/maps/spawn_points.asm similarity index 100% rename from data/spawn_points.asm rename to data/maps/spawn_points.asm diff --git a/data/palettes/49757.pal b/data/palettes/49757.pal new file mode 100644 index 000000000..93e884046 --- /dev/null +++ b/data/palettes/49757.pal @@ -0,0 +1,39 @@ + RGB 31, 31, 63 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 63 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 31, 00, 00 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 30, 16, 26 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 16, 16, 16 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 31, 12, 12 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 07, 08, 31 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 21, 00, 21 + RGB 29, 28, 09 + RGB 31, 31, 31 diff --git a/data/palettes/979c.pal b/data/palettes/979c.pal new file mode 100644 index 000000000..3940a030a --- /dev/null +++ b/data/palettes/979c.pal @@ -0,0 +1,29 @@ + RGB 31, 31, 31 + RGB 25, 25, 25 + RGB 13, 13, 13 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 07 + RGB 31, 16, 01 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 19, 24 + RGB 30, 10, 06 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 12, 25, 01 + RGB 05, 14, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 08, 12, 31 + RGB 01, 04, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 24, 18, 07 + RGB 20, 15, 03 + RGB 00, 00, 00 diff --git a/data/palettes/b6f1.pal b/data/palettes/b6f1.pal new file mode 100644 index 000000000..1dd56f50f --- /dev/null +++ b/data/palettes/b6f1.pal @@ -0,0 +1,24 @@ + RGB 31, 31, 31 + RGB 18, 23, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 22, 00, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 00, 00 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 25, 22, 00 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 23, 26, 31 + RGB 18, 23, 31 + RGB 00, 00, 00 diff --git a/data/palettes/b719.pal b/data/palettes/b719.pal new file mode 100644 index 000000000..09dd9a364 --- /dev/null +++ b/data/palettes/b719.pal @@ -0,0 +1,9 @@ + RGB 31, 31, 31 + RGB 07, 06, 03 + RGB 07, 06, 03 + RGB 07, 06, 03 + + RGB 31, 31, 31 + RGB 31, 31, 00 + RGB 26, 22, 00 + RGB 00, 00, 00 diff --git a/data/palettes/b789.pal b/data/palettes/b789.pal new file mode 100644 index 000000000..cce760662 --- /dev/null +++ b/data/palettes/b789.pal @@ -0,0 +1,19 @@ + RGB 31, 31, 31 + RGB 30, 22, 24 + RGB 18, 18, 18 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 10, 11, 31 + RGB 18, 18, 18 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 12, 31, 11 + RGB 18, 18, 18 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 29, 26, 05 + RGB 18, 18, 18 + RGB 00, 00, 00 diff --git a/data/palettes/card_flip.pal b/data/palettes/card_flip.pal new file mode 100644 index 000000000..24c5566f8 --- /dev/null +++ b/data/palettes/card_flip.pal @@ -0,0 +1,44 @@ + RGB 31, 31, 31 + RGB 17, 07, 31 + RGB 06, 19, 08 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 29, 25, 00 + RGB 06, 19, 08 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 13, 30 + RGB 06, 19, 08 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 08, 17, 30 + RGB 06, 19, 08 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 08, 31, 08 + RGB 06, 19, 08 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 17, 07, 31 + RGB 06, 19, 08 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 17, 07, 31 + RGB 06, 19, 08 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 17, 07, 31 + RGB 06, 19, 08 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 00, 00 + RGB 31, 00, 00 diff --git a/data/palettes/credits.pal b/data/palettes/credits.pal new file mode 100644 index 000000000..c473f0414 --- /dev/null +++ b/data/palettes/credits.pal @@ -0,0 +1,19 @@ +; pichu + RGB 31,00,31, 31,25,00, 11,14,31, 07,07,07 + RGB 31,05,05, 11,14,31, 11,14,31, 31,31,31 + RGB 31,05,05, 00,00,00, 31,31,31, 31,31,31 + +; smoochum + RGB 31,31,31, 31,27,00, 26,06,31, 07,07,07 + RGB 03,13,31, 20,00,24, 26,06,31, 31,31,31 + RGB 03,13,31, 00,00,00, 31,31,31, 31,31,31 + +; ditto + RGB 31,31,31, 23,12,28, 31,22,00, 07,07,07 + RGB 03,20,00, 31,22,00, 31,22,00, 31,31,31 + RGB 03,20,00, 00,00,00, 31,31,31, 31,31,31 + +; igglybuff + RGB 31,31,31, 31,10,31, 31,00,09, 07,07,07 + RGB 31,14,00, 31,00,09, 31,00,09, 31,31,31 + RGB 31,14,00, 31,31,31, 31,31,31, 31,31,31 diff --git a/data/palettes/crystal_intro/fade.pal b/data/palettes/crystal_intro/fade.pal new file mode 100644 index 000000000..8e03cbc43 --- /dev/null +++ b/data/palettes/crystal_intro/fade.pal @@ -0,0 +1,41 @@ +; Fade to white. + + RGB 24, 12, 09 + RGB 31, 31, 31 + RGB 12, 00, 31 + RGB 00, 00, 00 + + RGB 31, 19, 05 + RGB 31, 31, 31 + RGB 15, 05, 31 + RGB 07, 07, 07 + + RGB 31, 21, 09 + RGB 31, 31, 31 + RGB 18, 09, 31 + RGB 11, 11, 11 + + RGB 31, 23, 13 + RGB 31, 31, 31 + RGB 21, 13, 31 + RGB 15, 15, 15 + + RGB 31, 25, 17 + RGB 31, 31, 31 + RGB 25, 17, 31 + RGB 19, 19, 19 + + RGB 31, 27, 21 + RGB 31, 31, 31 + RGB 27, 21, 31 + RGB 23, 23, 23 + + RGB 31, 29, 25 + RGB 31, 31, 31 + RGB 29, 26, 31 + RGB 27, 27, 27 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 diff --git a/data/palettes/crystal_intro/gamefreak_logo.pal b/data/palettes/crystal_intro/gamefreak_logo.pal new file mode 100644 index 000000000..c3a526b82 --- /dev/null +++ b/data/palettes/crystal_intro/gamefreak_logo.pal @@ -0,0 +1,23 @@ +; Ditto's color as it turns into the Game Freak logo. +; Fade from pink to orange. +; One color per step. + + RGB 23, 12, 28 + RGB 23, 12, 27 + RGB 23, 13, 26 + RGB 23, 13, 24 + + RGB 24, 14, 22 + RGB 24, 14, 20 + RGB 24, 15, 18 + RGB 24, 15, 16 + + RGB 25, 16, 14 + RGB 25, 16, 12 + RGB 25, 17, 10 + RGB 25, 17, 08 + + RGB 26, 18, 06 + RGB 26, 18, 04 + RGB 26, 19, 02 + RGB 26, 19, 00 diff --git a/data/palettes/crystal_intro/intro_1.pal b/data/palettes/crystal_intro/intro_1.pal new file mode 100644 index 000000000..ae0faadac --- /dev/null +++ b/data/palettes/crystal_intro/intro_1.pal @@ -0,0 +1,79 @@ + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 0, 4, 5 + RGB 1, 8, 5 + RGB 4, 12, 9 + RGB 24, 12, 9 + + RGB 0, 4, 5 + RGB 9, 6, 8 + RGB 8, 16, 5 + RGB 5, 10, 4 + + RGB 31, 31, 31 + RGB 9, 6, 8 + RGB 18, 9, 9 + RGB 13, 8, 9 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 2, 5, 22 + RGB 1, 5, 12 + + RGB 31, 31, 31 + RGB 31, 10, 25 + RGB 31, 21, 0 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 21, 31 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 diff --git a/data/palettes/crystal_intro/intro_2.pal b/data/palettes/crystal_intro/intro_2.pal new file mode 100644 index 000000000..5f83df020 --- /dev/null +++ b/data/palettes/crystal_intro/intro_2.pal @@ -0,0 +1,79 @@ + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 10, 0, 10 + RGB 19, 0, 19 + RGB 31, 0, 31 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 diff --git a/data/palettes/crystal_intro/intro_3.pal b/data/palettes/crystal_intro/intro_3.pal new file mode 100644 index 000000000..95f3e052a --- /dev/null +++ b/data/palettes/crystal_intro/intro_3.pal @@ -0,0 +1,79 @@ + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 diff --git a/data/palettes/crystal_intro/intro_4.pal b/data/palettes/crystal_intro/intro_4.pal new file mode 100644 index 000000000..fdcf058de --- /dev/null +++ b/data/palettes/crystal_intro/intro_4.pal @@ -0,0 +1,79 @@ + RGB 24, 12, 9 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 24, 12, 9 + RGB 31, 31, 31 + RGB 8, 9, 31 + RGB 0, 0, 0 + + RGB 24, 12, 9 + RGB 12, 20, 31 + RGB 19, 8, 31 + RGB 0, 0, 0 + + RGB 12, 20, 31 + RGB 8, 9, 31 + RGB 19, 8, 31 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 12, 20, 31 + RGB 8, 9, 31 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 diff --git a/data/palettes/crystal_intro/intro_5.pal b/data/palettes/crystal_intro/intro_5.pal new file mode 100644 index 000000000..5b1be1a5f --- /dev/null +++ b/data/palettes/crystal_intro/intro_5.pal @@ -0,0 +1,79 @@ + RGB 24, 12, 9 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 24, 12, 9 + RGB 31, 31, 31 + RGB 8, 9, 31 + RGB 0, 0, 0 + + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + RGB 24, 12, 9 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 12, 0, 31 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 21, 9, 0 + RGB 21, 9, 0 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 11, 11, 11 + RGB 0, 0, 0 diff --git a/data/palettes/debug/bg.pal b/data/palettes/debug/bg.pal new file mode 100644 index 000000000..d0b573598 --- /dev/null +++ b/data/palettes/debug/bg.pal @@ -0,0 +1,43 @@ + ; white + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + ; red + RGB 31, 00, 00 + RGB 31, 00, 00 + RGB 31, 00, 00 + RGB 00, 00, 00 + + ; green + RGB 00, 31, 00 + RGB 00, 31, 00 + RGB 00, 31, 00 + RGB 00, 00, 00 + + ; blue + RGB 00, 00, 31 + RGB 00, 00, 31 + RGB 00, 00, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 diff --git a/data/palettes/debug/ob.pal b/data/palettes/debug/ob.pal new file mode 100644 index 000000000..2a03f4e8f --- /dev/null +++ b/data/palettes/debug/ob.pal @@ -0,0 +1,42 @@ + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + + ; red + RGB 31, 31, 31 + RGB 31, 00, 00 + RGB 31, 00, 00 + RGB 00, 00, 00 + + ; green + RGB 31, 31, 31 + RGB 00, 31, 00 + RGB 00, 31, 00 + RGB 00, 00, 00 + + ; blue + RGB 31, 31, 31 + RGB 00, 00, 31 + RGB 00, 00, 31 + RGB 00, 00, 00 diff --git a/data/palettes/diploma.pal b/data/palettes/diploma.pal new file mode 100644 index 000000000..2c9ec6453 --- /dev/null +++ b/data/palettes/diploma.pal @@ -0,0 +1,39 @@ + RGB 27, 31, 27 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 07, 06 + RGB 20, 02, 03 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 10, 31, 09 + RGB 04, 14, 01 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 08, 12, 31 + RGB 01, 04, 31 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 31, 07 + RGB 31, 16, 01 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 22, 16, 08 + RGB 13, 07, 01 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 15, 31, 31 + RGB 05, 17, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 11, 11, 19 + RGB 07, 07, 12 + RGB 00, 00, 00 diff --git a/data/palettes/mail.pal b/data/palettes/mail.pal new file mode 100644 index 000000000..4096ffae1 --- /dev/null +++ b/data/palettes/mail.pal @@ -0,0 +1,49 @@ + RGB 20, 31, 11 + RGB 31, 19, 00 + RGB 31, 10, 09 + RGB 00, 00, 00 + + RGB 15, 20, 31 + RGB 30, 26, 00 + RGB 31, 12, 00 + RGB 00, 00, 00 + + RGB 24, 17, 31 + RGB 30, 26, 00 + RGB 08, 11, 31 + RGB 00, 00, 00 + + RGB 31, 25, 17 + RGB 31, 18, 04 + RGB 28, 12, 05 + RGB 00, 00, 00 + + RGB 19, 26, 31 + RGB 31, 05, 08 + RGB 31, 09, 31 + RGB 00, 00, 00 + + RGB 31, 19, 28 + RGB 31, 21, 00 + RGB 12, 22, 00 + RGB 00, 00, 00 + + RGB 19, 17, 23 + RGB 30, 26, 00 + RGB 31, 12, 00 + RGB 00, 00, 00 + + RGB 07, 26, 31 + RGB 26, 26, 27 + RGB 31, 11, 11 + RGB 00, 00, 00 + + RGB 21, 31, 21 + RGB 30, 26, 00 + RGB 31, 12, 00 + RGB 00, 00, 00 + + RGB 07, 26, 31 + RGB 31, 31, 00 + RGB 00, 21, 00 + RGB 00, 00, 00 diff --git a/tilesets/ob.pal b/data/palettes/map_objects.pal similarity index 100% rename from tilesets/ob.pal rename to data/palettes/map_objects.pal diff --git a/data/palettes/mg_mobile.pal b/data/palettes/mg_mobile.pal new file mode 100644 index 000000000..c77e8c63f --- /dev/null +++ b/data/palettes/mg_mobile.pal @@ -0,0 +1,24 @@ + RGB 03, 07, 09 + RGB 26, 31, 00 + RGB 20, 16, 03 + RGB 31, 31, 31 + + RGB 13, 24, 29 + RGB 11, 16, 30 + RGB 07, 11, 22 + RGB 05, 06, 18 + + RGB 31, 31, 31 + RGB 20, 26, 31 + RGB 13, 24, 29 + RGB 11, 16, 30 + + RGB 31, 31, 31 + RGB 20, 26, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 20, 16, 08 + RGB 31, 00, 00 + RGB 00, 00, 00 diff --git a/data/palettes/pack.pal b/data/palettes/pack.pal new file mode 100644 index 000000000..e8b4979bb --- /dev/null +++ b/data/palettes/pack.pal @@ -0,0 +1,29 @@ + RGB 31, 31, 31 + RGB 15, 15, 31 + RGB 00, 00, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 15, 15, 31 + RGB 00, 00, 31 + RGB 00, 00, 00 + + RGB 31, 11, 31 + RGB 15, 15, 31 + RGB 00, 00, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 15, 15, 31 + RGB 00, 00, 31 + RGB 31, 00, 00 + + RGB 31, 31, 31 + RGB 15, 15, 31 + RGB 31, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 07, 19, 07 + RGB 07, 19, 07 + RGB 00, 00, 00 diff --git a/data/palettes/pack_f.pal b/data/palettes/pack_f.pal new file mode 100644 index 000000000..a962d97d1 --- /dev/null +++ b/data/palettes/pack_f.pal @@ -0,0 +1,29 @@ + RGB 31, 31, 31 + RGB 31, 14, 31 + RGB 31, 07, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 14, 31 + RGB 31, 07, 31 + RGB 00, 00, 00 + + RGB 15, 15, 31 + RGB 31, 14, 31 + RGB 31, 07, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 14, 31 + RGB 31, 07, 31 + RGB 31, 00, 00 + + RGB 31, 31, 31 + RGB 31, 14, 31 + RGB 31, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 07, 19, 07 + RGB 07, 19, 07 + RGB 00, 00, 00 diff --git a/data/palettes/party_menu.pal b/data/palettes/party_menu.pal new file mode 100644 index 000000000..70af517be --- /dev/null +++ b/data/palettes/party_menu.pal @@ -0,0 +1,69 @@ + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 10, 14, 20 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 27, 31, 27 + RGB 31, 19, 10 + RGB 31, 07, 04 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 07, 07, 07 + + RGB 31, 31, 31 + RGB 31, 31, 07 + RGB 31, 16, 01 + RGB 07, 07, 07 + + RGB 31, 31, 31 + RGB 31, 19, 24 + RGB 30, 10, 06 + RGB 07, 07, 07 + + RGB 31, 31, 31 + RGB 12, 25, 01 + RGB 05, 14, 00 + RGB 07, 07, 07 + + RGB 31, 31, 31 + RGB 08, 12, 31 + RGB 01, 04, 31 + RGB 07, 07, 07 + + RGB 31, 31, 31 + RGB 24, 18, 07 + RGB 20, 15, 03 + RGB 07, 07, 07 diff --git a/data/palettes/pokegear.pal b/data/palettes/pokegear.pal new file mode 100644 index 000000000..397986dec --- /dev/null +++ b/data/palettes/pokegear.pal @@ -0,0 +1,29 @@ + RGB 28, 31, 20 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 00, 00, 00 + + RGB 28, 31, 20 + RGB 00, 31, 00 + RGB 00, 00, 31 + RGB 00, 00, 00 + + RGB 28, 31, 20 + RGB 00, 31, 00 + RGB 15, 07, 00 + RGB 00, 00, 00 + + RGB 28, 31, 20 + RGB 31, 15, 00 + RGB 15, 07, 00 + RGB 00, 00, 00 + + RGB 28, 31, 20 + RGB 00, 31, 00 + RGB 00, 00, 31 + RGB 31, 00, 00 + + RGB 28, 31, 20 + RGB 00, 31, 00 + RGB 15, 07, 00 + RGB 31, 00, 00 diff --git a/data/palettes/pokegear_f.pal b/data/palettes/pokegear_f.pal new file mode 100644 index 000000000..3f797c866 --- /dev/null +++ b/data/palettes/pokegear_f.pal @@ -0,0 +1,29 @@ + RGB 28, 31, 20 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 00, 00, 00 + + RGB 28, 31, 20 + RGB 00, 31, 00 + RGB 00, 00, 31 + RGB 00, 00, 00 + + RGB 28, 31, 20 + RGB 00, 31, 00 + RGB 15, 07, 00 + RGB 00, 00, 00 + + RGB 28, 31, 20 + RGB 10, 18, 31 + RGB 13, 06, 31 + RGB 00, 00, 00 + + RGB 28, 31, 20 + RGB 00, 31, 00 + RGB 00, 00, 31 + RGB 31, 00, 00 + + RGB 28, 31, 20 + RGB 00, 31, 00 + RGB 15, 07, 00 + RGB 31, 00, 00 diff --git a/data/palettes/predef.pal b/data/palettes/predef.pal new file mode 100644 index 000000000..6975f17a2 --- /dev/null +++ b/data/palettes/predef.pal @@ -0,0 +1,394 @@ + RGB 31, 31, 31 + RGB 22, 25, 19 + RGB 16, 21, 30 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 27, 28, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 24, 28, 19 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 24, 24, 24 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 21, 23, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 24, 21, 27 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 24, 16 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 25, 30, 26 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 25, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 20, 19 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 26, 19 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 27, 28, 27 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 24, 30, 23 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 29, 24, 29 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 26, 23, 29 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 25, 23, 20 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 29, 26, 18 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 21, 18 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 26, 25, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 22, 21, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 22, 25, 21 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 21, 21, 22 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 20, 20 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 26, 26, 26 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 21, 14, 09 + RGB 15, 20, 20 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 12, 28, 22 + RGB 15, 20, 20 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 07, 07, 07 + RGB 02, 03, 03 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 22, 17 + RGB 16, 14, 19 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 18, 20, 27 + RGB 11, 15, 23 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 20, 10 + RGB 26, 10, 06 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 21, 25, 29 + RGB 14, 19, 25 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 27, 22, 24 + RGB 21, 15, 23 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 28, 20, 15 + RGB 21, 14, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 20, 26, 16 + RGB 09, 20, 11 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 22, 24 + RGB 28, 15, 21 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 28, 14 + RGB 26, 20, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 26, 21, 22 + RGB 15, 15, 18 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 23, 19, 13 + RGB 14, 12, 17 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 16, 18, 21 + RGB 10, 12, 18 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 22, 15, 16 + RGB 17, 02, 05 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 15, 20, 20 + RGB 05, 16, 16 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 23, 15, 19 + RGB 14, 04, 12 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 20, 17, 18 + RGB 18, 13, 11 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 23, 21, 16 + RGB 12, 12, 10 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 21, 25, 29 + RGB 30, 22, 24 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 26, 23, 16 + RGB 29, 14, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 18, 18, 18 + RGB 10, 10, 10 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 26, 15 + RGB 00, 23, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 26, 15 + RGB 31, 23, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 26, 15 + RGB 31, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 29, 26, 19 + RGB 27, 20, 14 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 24, 20, 10 + RGB 21, 00, 04 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 20, 10 + RGB 21, 00, 04 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 26, 16 + RGB 16, 12, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 15, 28, 26 + RGB 12, 22, 26 + RGB 03, 16, 14 + + RGB 31, 31, 31 + RGB 15, 28, 26 + RGB 23, 24, 24 + RGB 00, 00, 00 + + RGB 31, 31, 24 + RGB 07, 27, 19 + RGB 26, 20, 10 + RGB 19, 12, 08 + + RGB 31, 31, 31 + RGB 31, 28, 14 + RGB 31, 13, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 16, 18, 21 + RGB 10, 12, 18 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 23, 21, 16 + RGB 12, 12, 10 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 14, 00 + RGB 07, 11, 15 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 26, 21, 22 + RGB 26, 10, 06 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 27, 04 + RGB 24, 20, 11 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 13, 25 + RGB 24, 20, 11 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 16, 19, 29 + RGB 24, 20, 11 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 22, 24 + RGB 18, 18, 18 + RGB 16, 10, 07 + + RGB 31, 31, 31 + RGB 21, 25, 29 + RGB 18, 18, 18 + RGB 16, 10, 07 + + RGB 31, 31, 31 + RGB 20, 26, 16 + RGB 18, 18, 18 + RGB 16, 10, 07 + + RGB 31, 31, 31 + RGB 31, 28, 14 + RGB 18, 18, 18 + RGB 16, 10, 07 + + RGB 31, 31, 31 + RGB 18, 18, 18 + RGB 26, 10, 06 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 22, 24 + RGB 28, 15, 21 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 26, 20, 00 + RGB 16, 19, 29 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 16, 02, 30 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 16, 13, 04 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 28, 04, 02 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 18, 23, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 24, 20, 11 + RGB 18, 13, 11 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 25, 30, 00 + RGB 25, 30, 00 + + RGB 00, 00, 00 + RGB 08, 11, 11 + RGB 21, 21, 21 + RGB 31, 31, 31 diff --git a/tilesets/roof.pal b/data/palettes/roofs.pal similarity index 100% rename from tilesets/roof.pal rename to data/palettes/roofs.pal diff --git a/data/palettes/sgb_border.pal b/data/palettes/sgb_border.pal new file mode 100644 index 000000000..fd5aec402 --- /dev/null +++ b/data/palettes/sgb_border.pal @@ -0,0 +1,79 @@ + RGB 24, 06, 06 + RGB 24, 24, 26 + RGB 14, 15, 20 + RGB 04, 07, 10 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 18, 24, 18 + RGB 31, 26, 15 + RGB 26, 19, 10 + RGB 12, 07, 05 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 18, 06, 31 + RGB 31, 31, 29 + RGB 31, 12, 00 + RGB 00, 00, 00 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 12, 31, 06 + RGB 22, 26, 30 + RGB 16, 17, 21 + RGB 00, 03, 00 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 diff --git a/data/palettes/slot_machine.pal b/data/palettes/slot_machine.pal new file mode 100644 index 000000000..0eec479f2 --- /dev/null +++ b/data/palettes/slot_machine.pal @@ -0,0 +1,79 @@ + RGB 31, 31, 31 + RGB 24, 25, 28 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 10, 06 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 15, 31, 00 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 15, 31 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 15, 21, 31 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 11 + RGB 31, 31, 06 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 16, 19, 29 + RGB 25, 22, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 10, 06 + RGB 31, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 12, 25, 01 + RGB 05, 14, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 12, 25, 01 + RGB 30, 10, 06 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 06 + RGB 20, 15, 03 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 06 + RGB 15, 21, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 06 + RGB 20, 15, 03 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 24, 21 + RGB 31, 13, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 diff --git a/tilesets/bg.pal b/data/palettes/tileset_bg.pal similarity index 100% rename from tilesets/bg.pal rename to data/palettes/tileset_bg.pal diff --git a/data/palettes/title.pal b/data/palettes/title.pal new file mode 100644 index 000000000..95bc2a394 --- /dev/null +++ b/data/palettes/title.pal @@ -0,0 +1,81 @@ +; BG + RGB 00, 00, 00 + RGB 19, 00, 00 + RGB 15, 08, 31 + RGB 15, 08, 31 + + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 15, 16, 31 + RGB 31, 01, 13 + + RGB 00, 00, 00 + RGB 07, 07, 07 + RGB 31, 31, 31 + RGB 02, 03, 30 + + RGB 00, 00, 00 + RGB 13, 13, 13 + RGB 31, 31, 18 + RGB 02, 03, 30 + + RGB 00, 00, 00 + RGB 19, 19, 19 + RGB 29, 28, 12 + RGB 02, 03, 30 + + RGB 00, 00, 00 + RGB 25, 25, 25 + RGB 28, 25, 06 + RGB 02, 03, 30 + + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 26, 21, 00 + RGB 02, 03, 30 + + RGB 00, 00, 00 + RGB 11, 11, 19 + RGB 31, 31, 31 + RGB 00, 00, 00 + +; OBJ + RGB 00, 00, 00 + RGB 10, 00, 15 + RGB 17, 05, 22 + RGB 19, 09, 31 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 + RGB 00, 00, 00 diff --git a/data/palettes/town_map.asm b/data/palettes/town_map.asm new file mode 100644 index 000000000..49fb7a9ce --- /dev/null +++ b/data/palettes/town_map.asm @@ -0,0 +1,34 @@ + const_def + const PAL_TOWNMAP_BORDER ; 0 + const PAL_TOWNMAP_EARTH ; 1 + const PAL_TOWNMAP_MOUNTAIN ; 2 + const PAL_TOWNMAP_CITY ; 3 + const PAL_TOWNMAP_POI ; 4 + const PAL_TOWNMAP_POI_MTN ; 5 + +townmappals: macro +rept _NARG / 2 + dn PAL_TOWNMAP_\2, PAL_TOWNMAP_\1 + shift + shift +endr +endm + +; gfx/pokegear/town_map.png + townmappals EARTH, EARTH, EARTH, MOUNTAIN, MOUNTAIN, MOUNTAIN + townmappals BORDER, BORDER, EARTH, EARTH, CITY, EARTH + townmappals POI, POI_MTN, POI, POI_MTN, EARTH, EARTH + townmappals EARTH, MOUNTAIN, MOUNTAIN, MOUNTAIN, BORDER, BORDER + townmappals EARTH, EARTH, BORDER, EARTH, EARTH, BORDER + townmappals BORDER, BORDER, EARTH, EARTH, EARTH, MOUNTAIN + townmappals MOUNTAIN, MOUNTAIN, BORDER, BORDER, BORDER, BORDER + townmappals BORDER, BORDER, BORDER, BORDER, BORDER, BORDER +; gfx/pokegear/pokegear.png + townmappals BORDER, BORDER, BORDER, BORDER, POI, POI + townmappals POI, BORDER, BORDER, BORDER, BORDER, BORDER + townmappals BORDER, BORDER, BORDER, BORDER, CITY, CITY + townmappals CITY, CITY, CITY, CITY, CITY, CITY + townmappals CITY, CITY, CITY, CITY, CITY, CITY + townmappals CITY, BORDER, CITY, CITY, CITY, CITY + townmappals CITY, CITY, CITY, CITY, BORDER, BORDER + townmappals BORDER, BORDER, BORDER, BORDER, BORDER, BORDER diff --git a/data/palettes/trade_room.pal b/data/palettes/trade_room.pal new file mode 100644 index 000000000..b5615248e --- /dev/null +++ b/data/palettes/trade_room.pal @@ -0,0 +1,29 @@ + RGB 04, 02, 15 + RGB 07, 09, 31 + RGB 31, 00, 00 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 07, 09, 31 + RGB 15, 23, 30 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 07, 09, 31 + RGB 16, 16, 16 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 07, 09, 31 + RGB 25, 07, 04 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 07, 09, 31 + RGB 03, 22, 08 + RGB 31, 31, 31 + + RGB 04, 02, 15 + RGB 07, 09, 31 + RGB 29, 28, 09 + RGB 31, 31, 31 diff --git a/data/palettes/unused_title/bg.pal b/data/palettes/unused_title/bg.pal new file mode 100644 index 000000000..f0604a261 --- /dev/null +++ b/data/palettes/unused_title/bg.pal @@ -0,0 +1,39 @@ + RGB 00, 00, 00 + RGB 25, 15, 28 + RGB 22, 11, 28 + RGB 19, 08, 26 + + RGB 00, 00, 00 + RGB 17, 07, 22 + RGB 13, 07, 16 + RGB 19, 08, 26 + + RGB 25, 15, 28 + RGB 22, 11, 28 + RGB 19, 08, 26 + RGB 17, 07, 22 + + RGB 22, 11, 28 + RGB 19, 08, 26 + RGB 17, 07, 22 + RGB 13, 07, 16 + + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 16, 16, 24 + RGB 02, 13, 21 + + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 12, 12, 12 + + RGB 00, 00, 00 + RGB 01, 11, 23 + RGB 16, 16, 24 + RGB 02, 13, 21 + + RGB 00, 00, 00 + RGB 22, 10, 31 + RGB 19, 08, 26 + RGB 17, 07, 22 diff --git a/data/palettes/unused_title/ob.pal b/data/palettes/unused_title/ob.pal new file mode 100644 index 000000000..80e7d9896 --- /dev/null +++ b/data/palettes/unused_title/ob.pal @@ -0,0 +1,319 @@ + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 16, 16, 24 + RGB 02, 13, 21 + + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 12, 12, 12 + + RGB 00, 00, 00 + RGB 01, 11, 23 + RGB 16, 16, 24 + RGB 02, 13, 21 + + RGB 00, 00, 00 + RGB 31, 22, 00 + RGB 31, 27, 00 + RGB 31, 31, 00 + + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 16, 16, 24 + RGB 02, 13, 21 + + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 12, 12, 12 + + RGB 00, 00, 00 + RGB 01, 11, 23 + RGB 16, 16, 24 + RGB 02, 13, 21 + + RGB 16, 31, 00 + RGB 22, 31, 00 + RGB 27, 31, 00 + RGB 31, 31, 00 + + RGB 31, 00, 18 + RGB 31, 31, 31 + RGB 16, 16, 24 + RGB 02, 13, 21 + + RGB 00, 00, 00 + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 12, 12, 12 + + RGB 00, 00, 00 + RGB 01, 11, 23 + RGB 16, 16, 24 + RGB 02, 13, 21 + + RGB 16, 31, 00 + RGB 22, 31, 00 + RGB 27, 31, 00 + RGB 31, 31, 00 + + RGB 24, 18, 31 + RGB 31, 31, 00 + RGB 31, 31, 01 + RGB 31, 31, 03 + + RGB 31, 31, 05 + RGB 31, 31, 08 + RGB 31, 31, 10 + RGB 31, 31, 12 + + RGB 31, 31, 14 + RGB 31, 31, 16 + RGB 31, 31, 18 + RGB 31, 31, 20 + + RGB 31, 31, 22 + RGB 31, 31, 25 + RGB 31, 31, 27 + RGB 31, 31, 29 + + RGB 24, 06, 06 + RGB 01, 01, 01 + RGB 03, 03, 03 + RGB 05, 05, 05 + + RGB 08, 08, 08 + RGB 10, 10, 10 + RGB 12, 12, 12 + RGB 14, 14, 14 + + RGB 16, 16, 16 + RGB 18, 18, 18 + RGB 20, 20, 20 + RGB 22, 22, 22 + + RGB 25, 25, 25 + RGB 27, 27, 27 + RGB 29, 29, 29 + RGB 31, 31, 31 + + RGB 18, 24, 18 + RGB 31, 29, 01 + RGB 31, 27, 03 + RGB 31, 25, 05 + + RGB 31, 22, 08 + RGB 31, 20, 10 + RGB 31, 18, 12 + RGB 31, 16, 14 + + RGB 31, 14, 16 + RGB 31, 12, 18 + RGB 31, 10, 20 + RGB 31, 08, 22 + + RGB 31, 05, 25 + RGB 31, 03, 27 + RGB 31, 01, 29 + RGB 31, 00, 31 + + RGB 18, 06, 31 + RGB 00, 31, 31 + RGB 00, 31, 29 + RGB 00, 31, 27 + + RGB 00, 31, 25 + RGB 00, 31, 22 + RGB 00, 31, 20 + RGB 00, 31, 18 + + RGB 00, 31, 16 + RGB 00, 31, 14 + RGB 00, 31, 12 + RGB 00, 31, 10 + + RGB 00, 31, 08 + RGB 00, 31, 05 + RGB 00, 31, 03 + RGB 00, 31, 01 + + RGB 12, 31, 06 + RGB 00, 00, 31 + RGB 00, 01, 31 + RGB 00, 03, 31 + + RGB 00, 05, 31 + RGB 00, 08, 31 + RGB 00, 10, 31 + RGB 00, 12, 31 + + RGB 00, 14, 31 + RGB 00, 16, 31 + RGB 00, 18, 31 + RGB 00, 20, 31 + + RGB 00, 22, 31 + RGB 00, 25, 31 + RGB 00, 27, 31 + RGB 00, 29, 31 + + RGB 00, 00, 00 + RGB 06, 00, 04 + RGB 19, 02, 09 + RGB 28, 04, 11 + + RGB 31, 07, 16 + RGB 31, 17, 23 + RGB 31, 26, 30 + RGB 07, 05, 10 + + RGB 14, 10, 18 + RGB 20, 20, 25 + RGB 25, 27, 31 + RGB 09, 05, 06 + + RGB 23, 16, 13 + RGB 30, 23, 22 + RGB 31, 28, 28 + RGB 31, 31, 31 + + RGB 06, 31, 31 + RGB 04, 00, 04 + RGB 11, 02, 04 + RGB 17, 02, 04 + + RGB 24, 05, 04 + RGB 28, 07, 04 + RGB 31, 11, 04 + RGB 02, 01, 15 + + RGB 04, 11, 22 + RGB 12, 25, 25 + RGB 20, 31, 31 + RGB 09, 04, 03 + + RGB 22, 11, 08 + RGB 27, 19, 16 + RGB 30, 28, 26 + RGB 31, 31, 31 + + RGB 06, 18, 06 + RGB 04, 04, 02 + RGB 07, 07, 02 + RGB 18, 18, 04 + + RGB 24, 24, 06 + RGB 27, 27, 11 + RGB 31, 31, 20 + RGB 02, 03, 10 + + RGB 04, 05, 13 + RGB 06, 10, 25 + RGB 08, 15, 31 + RGB 04, 00, 06 + + RGB 11, 07, 14 + RGB 21, 16, 23 + RGB 29, 26, 31 + RGB 31, 31, 31 + + RGB 06, 00, 18 + RGB 00, 04, 03 + RGB 02, 09, 05 + RGB 11, 19, 07 + + RGB 16, 24, 08 + RGB 22, 31, 09 + RGB 24, 31, 18 + RGB 03, 01, 03 + + RGB 10, 04, 10 + RGB 20, 08, 20 + RGB 31, 17, 31 + RGB 01, 03, 06 + + RGB 05, 09, 10 + RGB 15, 21, 21 + RGB 23, 25, 25 + RGB 31, 31, 31 + + RGB 00, 18, 31 + RGB 00, 05, 07 + RGB 00, 08, 13 + RGB 00, 12, 17 + + RGB 01, 20, 24 + RGB 04, 27, 31 + RGB 14, 31, 31 + RGB 04, 02, 02 + + RGB 15, 01, 03 + RGB 26, 04, 07 + RGB 31, 13, 16 + RGB 00, 05, 02 + + RGB 01, 11, 03 + RGB 06, 21, 06 + RGB 13, 31, 16 + RGB 31, 31, 31 + + RGB 00, 06, 06 + RGB 00, 01, 08 + RGB 00, 05, 14 + RGB 00, 08, 19 + + RGB 02, 14, 26 + RGB 04, 21, 31 + RGB 06, 26, 31 + RGB 13, 00, 00 + + RGB 27, 07, 00 + RGB 31, 17, 05 + RGB 31, 25, 16 + RGB 02, 04, 00 + + RGB 07, 11, 03 + RGB 17, 19, 05 + RGB 27, 31, 16 + RGB 31, 31, 31 + + RGB 02, 00, 00 + RGB 04, 01, 06 + RGB 11, 03, 14 + RGB 16, 04, 19 + + RGB 20, 07, 22 + RGB 26, 12, 27 + RGB 26, 20, 31 + RGB 04, 07, 00 + + RGB 16, 20, 07 + RGB 24, 28, 15 + RGB 29, 31, 24 + RGB 05, 02, 02 + + RGB 15, 04, 02 + RGB 24, 11, 10 + RGB 31, 22, 20 + RGB 31, 31, 31 + + RGB 00, 00, 14 + RGB 12, 00, 00 + RGB 27, 05, 00 + RGB 31, 15, 05 + + RGB 31, 26, 13 + RGB 31, 30, 21 + RGB 05, 07, 16 + RGB 04, 16, 20 + + RGB 04, 24, 26 + RGB 08, 31, 31 + RGB 23, 31, 31 + RGB 00, 00, 00 + + RGB 05, 05, 05 + RGB 17, 17, 15 + RGB 28, 28, 24 + RGB 31, 31, 31 diff --git a/data/pokedex/entries.asm b/data/pokedex/entries.asm deleted file mode 100644 index a12cdd3f4..000000000 --- a/data/pokedex/entries.asm +++ /dev/null @@ -1,272 +0,0 @@ -INCLUDE "includes.asm" - - -SECTION "Pokedex Entries 001-064", ROMX - -PokedexEntries1:: -BulbasaurPokedexEntry:: INCLUDE "data/pokedex/entries/bulbasaur.asm" -IvysaurPokedexEntry:: INCLUDE "data/pokedex/entries/ivysaur.asm" -VenusaurPokedexEntry:: INCLUDE "data/pokedex/entries/venusaur.asm" -CharmanderPokedexEntry:: INCLUDE "data/pokedex/entries/charmander.asm" -CharmeleonPokedexEntry:: INCLUDE "data/pokedex/entries/charmeleon.asm" -CharizardPokedexEntry:: INCLUDE "data/pokedex/entries/charizard.asm" -SquirtlePokedexEntry:: INCLUDE "data/pokedex/entries/squirtle.asm" -WartortlePokedexEntry:: INCLUDE "data/pokedex/entries/wartortle.asm" -BlastoisePokedexEntry:: INCLUDE "data/pokedex/entries/blastoise.asm" -CaterpiePokedexEntry:: INCLUDE "data/pokedex/entries/caterpie.asm" -MetapodPokedexEntry:: INCLUDE "data/pokedex/entries/metapod.asm" -ButterfreePokedexEntry:: INCLUDE "data/pokedex/entries/butterfree.asm" -WeedlePokedexEntry:: INCLUDE "data/pokedex/entries/weedle.asm" -KakunaPokedexEntry:: INCLUDE "data/pokedex/entries/kakuna.asm" -BeedrillPokedexEntry:: INCLUDE "data/pokedex/entries/beedrill.asm" -PidgeyPokedexEntry:: INCLUDE "data/pokedex/entries/pidgey.asm" -PidgeottoPokedexEntry:: INCLUDE "data/pokedex/entries/pidgeotto.asm" -PidgeotPokedexEntry:: INCLUDE "data/pokedex/entries/pidgeot.asm" -RattataPokedexEntry:: INCLUDE "data/pokedex/entries/rattata.asm" -RaticatePokedexEntry:: INCLUDE "data/pokedex/entries/raticate.asm" -SpearowPokedexEntry:: INCLUDE "data/pokedex/entries/spearow.asm" -FearowPokedexEntry:: INCLUDE "data/pokedex/entries/fearow.asm" -EkansPokedexEntry:: INCLUDE "data/pokedex/entries/ekans.asm" -ArbokPokedexEntry:: INCLUDE "data/pokedex/entries/arbok.asm" -PikachuPokedexEntry:: INCLUDE "data/pokedex/entries/pikachu.asm" -RaichuPokedexEntry:: INCLUDE "data/pokedex/entries/raichu.asm" -SandshrewPokedexEntry:: INCLUDE "data/pokedex/entries/sandshrew.asm" -SandslashPokedexEntry:: INCLUDE "data/pokedex/entries/sandslash.asm" -NidoranFPokedexEntry:: INCLUDE "data/pokedex/entries/nidoran_f.asm" -NidorinaPokedexEntry:: INCLUDE "data/pokedex/entries/nidorina.asm" -NidoqueenPokedexEntry:: INCLUDE "data/pokedex/entries/nidoqueen.asm" -NidoranMPokedexEntry:: INCLUDE "data/pokedex/entries/nidoran_m.asm" -NidorinoPokedexEntry:: INCLUDE "data/pokedex/entries/nidorino.asm" -NidokingPokedexEntry:: INCLUDE "data/pokedex/entries/nidoking.asm" -ClefairyPokedexEntry:: INCLUDE "data/pokedex/entries/clefairy.asm" -ClefablePokedexEntry:: INCLUDE "data/pokedex/entries/clefable.asm" -VulpixPokedexEntry:: INCLUDE "data/pokedex/entries/vulpix.asm" -NinetalesPokedexEntry:: INCLUDE "data/pokedex/entries/ninetales.asm" -JigglypuffPokedexEntry:: INCLUDE "data/pokedex/entries/jigglypuff.asm" -WigglytuffPokedexEntry:: INCLUDE "data/pokedex/entries/wigglytuff.asm" -ZubatPokedexEntry:: INCLUDE "data/pokedex/entries/zubat.asm" -GolbatPokedexEntry:: INCLUDE "data/pokedex/entries/golbat.asm" -OddishPokedexEntry:: INCLUDE "data/pokedex/entries/oddish.asm" -GloomPokedexEntry:: INCLUDE "data/pokedex/entries/gloom.asm" -VileplumePokedexEntry:: INCLUDE "data/pokedex/entries/vileplume.asm" -ParasPokedexEntry:: INCLUDE "data/pokedex/entries/paras.asm" -ParasectPokedexEntry:: INCLUDE "data/pokedex/entries/parasect.asm" -VenonatPokedexEntry:: INCLUDE "data/pokedex/entries/venonat.asm" -VenomothPokedexEntry:: INCLUDE "data/pokedex/entries/venomoth.asm" -DiglettPokedexEntry:: INCLUDE "data/pokedex/entries/diglett.asm" -DugtrioPokedexEntry:: INCLUDE "data/pokedex/entries/dugtrio.asm" -MeowthPokedexEntry:: INCLUDE "data/pokedex/entries/meowth.asm" -PersianPokedexEntry:: INCLUDE "data/pokedex/entries/persian.asm" -PsyduckPokedexEntry:: INCLUDE "data/pokedex/entries/psyduck.asm" -GolduckPokedexEntry:: INCLUDE "data/pokedex/entries/golduck.asm" -MankeyPokedexEntry:: INCLUDE "data/pokedex/entries/mankey.asm" -PrimeapePokedexEntry:: INCLUDE "data/pokedex/entries/primeape.asm" -GrowlithePokedexEntry:: INCLUDE "data/pokedex/entries/growlithe.asm" -ArcaninePokedexEntry:: INCLUDE "data/pokedex/entries/arcanine.asm" -PoliwagPokedexEntry:: INCLUDE "data/pokedex/entries/poliwag.asm" -PoliwhirlPokedexEntry:: INCLUDE "data/pokedex/entries/poliwhirl.asm" -PoliwrathPokedexEntry:: INCLUDE "data/pokedex/entries/poliwrath.asm" -AbraPokedexEntry:: INCLUDE "data/pokedex/entries/abra.asm" -KadabraPokedexEntry:: INCLUDE "data/pokedex/entries/kadabra.asm" - - -SECTION "Pokedex Entries 065-128", ROMX - -PokedexEntries2:: -AlakazamPokedexEntry:: INCLUDE "data/pokedex/entries/alakazam.asm" -MachopPokedexEntry:: INCLUDE "data/pokedex/entries/machop.asm" -MachokePokedexEntry:: INCLUDE "data/pokedex/entries/machoke.asm" -MachampPokedexEntry:: INCLUDE "data/pokedex/entries/machamp.asm" -BellsproutPokedexEntry:: INCLUDE "data/pokedex/entries/bellsprout.asm" -WeepinbellPokedexEntry:: INCLUDE "data/pokedex/entries/weepinbell.asm" -VictreebelPokedexEntry:: INCLUDE "data/pokedex/entries/victreebel.asm" -TentacoolPokedexEntry:: INCLUDE "data/pokedex/entries/tentacool.asm" -TentacruelPokedexEntry:: INCLUDE "data/pokedex/entries/tentacruel.asm" -GeodudePokedexEntry:: INCLUDE "data/pokedex/entries/geodude.asm" -GravelerPokedexEntry:: INCLUDE "data/pokedex/entries/graveler.asm" -GolemPokedexEntry:: INCLUDE "data/pokedex/entries/golem.asm" -PonytaPokedexEntry:: INCLUDE "data/pokedex/entries/ponyta.asm" -RapidashPokedexEntry:: INCLUDE "data/pokedex/entries/rapidash.asm" -SlowpokePokedexEntry:: INCLUDE "data/pokedex/entries/slowpoke.asm" -SlowbroPokedexEntry:: INCLUDE "data/pokedex/entries/slowbro.asm" -MagnemitePokedexEntry:: INCLUDE "data/pokedex/entries/magnemite.asm" -MagnetonPokedexEntry:: INCLUDE "data/pokedex/entries/magneton.asm" -FarfetchDPokedexEntry:: INCLUDE "data/pokedex/entries/farfetch_d.asm" -DoduoPokedexEntry:: INCLUDE "data/pokedex/entries/doduo.asm" -DodrioPokedexEntry:: INCLUDE "data/pokedex/entries/dodrio.asm" -SeelPokedexEntry:: INCLUDE "data/pokedex/entries/seel.asm" -DewgongPokedexEntry:: INCLUDE "data/pokedex/entries/dewgong.asm" -GrimerPokedexEntry:: INCLUDE "data/pokedex/entries/grimer.asm" -MukPokedexEntry:: INCLUDE "data/pokedex/entries/muk.asm" -ShellderPokedexEntry:: INCLUDE "data/pokedex/entries/shellder.asm" -CloysterPokedexEntry:: INCLUDE "data/pokedex/entries/cloyster.asm" -GastlyPokedexEntry:: INCLUDE "data/pokedex/entries/gastly.asm" -HaunterPokedexEntry:: INCLUDE "data/pokedex/entries/haunter.asm" -GengarPokedexEntry:: INCLUDE "data/pokedex/entries/gengar.asm" -OnixPokedexEntry:: INCLUDE "data/pokedex/entries/onix.asm" -DrowzeePokedexEntry:: INCLUDE "data/pokedex/entries/drowzee.asm" -HypnoPokedexEntry:: INCLUDE "data/pokedex/entries/hypno.asm" -KrabbyPokedexEntry:: INCLUDE "data/pokedex/entries/krabby.asm" -KinglerPokedexEntry:: INCLUDE "data/pokedex/entries/kingler.asm" -VoltorbPokedexEntry:: INCLUDE "data/pokedex/entries/voltorb.asm" -ElectrodePokedexEntry:: INCLUDE "data/pokedex/entries/electrode.asm" -ExeggcutePokedexEntry:: INCLUDE "data/pokedex/entries/exeggcute.asm" -ExeggutorPokedexEntry:: INCLUDE "data/pokedex/entries/exeggutor.asm" -CubonePokedexEntry:: INCLUDE "data/pokedex/entries/cubone.asm" -MarowakPokedexEntry:: INCLUDE "data/pokedex/entries/marowak.asm" -HitmonleePokedexEntry:: INCLUDE "data/pokedex/entries/hitmonlee.asm" -HitmonchanPokedexEntry:: INCLUDE "data/pokedex/entries/hitmonchan.asm" -LickitungPokedexEntry:: INCLUDE "data/pokedex/entries/lickitung.asm" -KoffingPokedexEntry:: INCLUDE "data/pokedex/entries/koffing.asm" -WeezingPokedexEntry:: INCLUDE "data/pokedex/entries/weezing.asm" -RhyhornPokedexEntry:: INCLUDE "data/pokedex/entries/rhyhorn.asm" -RhydonPokedexEntry:: INCLUDE "data/pokedex/entries/rhydon.asm" -ChanseyPokedexEntry:: INCLUDE "data/pokedex/entries/chansey.asm" -TangelaPokedexEntry:: INCLUDE "data/pokedex/entries/tangela.asm" -KangaskhanPokedexEntry:: INCLUDE "data/pokedex/entries/kangaskhan.asm" -HorseaPokedexEntry:: INCLUDE "data/pokedex/entries/horsea.asm" -SeadraPokedexEntry:: INCLUDE "data/pokedex/entries/seadra.asm" -GoldeenPokedexEntry:: INCLUDE "data/pokedex/entries/goldeen.asm" -SeakingPokedexEntry:: INCLUDE "data/pokedex/entries/seaking.asm" -StaryuPokedexEntry:: INCLUDE "data/pokedex/entries/staryu.asm" -StarmiePokedexEntry:: INCLUDE "data/pokedex/entries/starmie.asm" -MrMimePokedexEntry:: INCLUDE "data/pokedex/entries/mr__mime.asm" -ScytherPokedexEntry:: INCLUDE "data/pokedex/entries/scyther.asm" -JynxPokedexEntry:: INCLUDE "data/pokedex/entries/jynx.asm" -ElectabuzzPokedexEntry:: INCLUDE "data/pokedex/entries/electabuzz.asm" -MagmarPokedexEntry:: INCLUDE "data/pokedex/entries/magmar.asm" -PinsirPokedexEntry:: INCLUDE "data/pokedex/entries/pinsir.asm" -TaurosPokedexEntry:: INCLUDE "data/pokedex/entries/tauros.asm" - - -SECTION "Pokedex Entries 129-192", ROMX - -PokedexEntries3:: -MagikarpPokedexEntry:: INCLUDE "data/pokedex/entries/magikarp.asm" -GyaradosPokedexEntry:: INCLUDE "data/pokedex/entries/gyarados.asm" -LaprasPokedexEntry:: INCLUDE "data/pokedex/entries/lapras.asm" -DittoPokedexEntry:: INCLUDE "data/pokedex/entries/ditto.asm" -EeveePokedexEntry:: INCLUDE "data/pokedex/entries/eevee.asm" -VaporeonPokedexEntry:: INCLUDE "data/pokedex/entries/vaporeon.asm" -JolteonPokedexEntry:: INCLUDE "data/pokedex/entries/jolteon.asm" -FlareonPokedexEntry:: INCLUDE "data/pokedex/entries/flareon.asm" -PorygonPokedexEntry:: INCLUDE "data/pokedex/entries/porygon.asm" -OmanytePokedexEntry:: INCLUDE "data/pokedex/entries/omanyte.asm" -OmastarPokedexEntry:: INCLUDE "data/pokedex/entries/omastar.asm" -KabutoPokedexEntry:: INCLUDE "data/pokedex/entries/kabuto.asm" -KabutopsPokedexEntry:: INCLUDE "data/pokedex/entries/kabutops.asm" -AerodactylPokedexEntry:: INCLUDE "data/pokedex/entries/aerodactyl.asm" -SnorlaxPokedexEntry:: INCLUDE "data/pokedex/entries/snorlax.asm" -ArticunoPokedexEntry:: INCLUDE "data/pokedex/entries/articuno.asm" -ZapdosPokedexEntry:: INCLUDE "data/pokedex/entries/zapdos.asm" -MoltresPokedexEntry:: INCLUDE "data/pokedex/entries/moltres.asm" -DratiniPokedexEntry:: INCLUDE "data/pokedex/entries/dratini.asm" -DragonairPokedexEntry:: INCLUDE "data/pokedex/entries/dragonair.asm" -DragonitePokedexEntry:: INCLUDE "data/pokedex/entries/dragonite.asm" -MewtwoPokedexEntry:: INCLUDE "data/pokedex/entries/mewtwo.asm" -MewPokedexEntry:: INCLUDE "data/pokedex/entries/mew.asm" -ChikoritaPokedexEntry:: INCLUDE "data/pokedex/entries/chikorita.asm" -BayleefPokedexEntry:: INCLUDE "data/pokedex/entries/bayleef.asm" -MeganiumPokedexEntry:: INCLUDE "data/pokedex/entries/meganium.asm" -CyndaquilPokedexEntry:: INCLUDE "data/pokedex/entries/cyndaquil.asm" -QuilavaPokedexEntry:: INCLUDE "data/pokedex/entries/quilava.asm" -TyphlosionPokedexEntry:: INCLUDE "data/pokedex/entries/typhlosion.asm" -TotodilePokedexEntry:: INCLUDE "data/pokedex/entries/totodile.asm" -CroconawPokedexEntry:: INCLUDE "data/pokedex/entries/croconaw.asm" -FeraligatrPokedexEntry:: INCLUDE "data/pokedex/entries/feraligatr.asm" -SentretPokedexEntry:: INCLUDE "data/pokedex/entries/sentret.asm" -FurretPokedexEntry:: INCLUDE "data/pokedex/entries/furret.asm" -HoothootPokedexEntry:: INCLUDE "data/pokedex/entries/hoothoot.asm" -NoctowlPokedexEntry:: INCLUDE "data/pokedex/entries/noctowl.asm" -LedybaPokedexEntry:: INCLUDE "data/pokedex/entries/ledyba.asm" -LedianPokedexEntry:: INCLUDE "data/pokedex/entries/ledian.asm" -SpinarakPokedexEntry:: INCLUDE "data/pokedex/entries/spinarak.asm" -AriadosPokedexEntry:: INCLUDE "data/pokedex/entries/ariados.asm" -CrobatPokedexEntry:: INCLUDE "data/pokedex/entries/crobat.asm" -ChinchouPokedexEntry:: INCLUDE "data/pokedex/entries/chinchou.asm" -LanturnPokedexEntry:: INCLUDE "data/pokedex/entries/lanturn.asm" -PichuPokedexEntry:: INCLUDE "data/pokedex/entries/pichu.asm" -CleffaPokedexEntry:: INCLUDE "data/pokedex/entries/cleffa.asm" -IgglybuffPokedexEntry:: INCLUDE "data/pokedex/entries/igglybuff.asm" -TogepiPokedexEntry:: INCLUDE "data/pokedex/entries/togepi.asm" -TogeticPokedexEntry:: INCLUDE "data/pokedex/entries/togetic.asm" -NatuPokedexEntry:: INCLUDE "data/pokedex/entries/natu.asm" -XatuPokedexEntry:: INCLUDE "data/pokedex/entries/xatu.asm" -MareepPokedexEntry:: INCLUDE "data/pokedex/entries/mareep.asm" -FlaaffyPokedexEntry:: INCLUDE "data/pokedex/entries/flaaffy.asm" -AmpharosPokedexEntry:: INCLUDE "data/pokedex/entries/ampharos.asm" -BellossomPokedexEntry:: INCLUDE "data/pokedex/entries/bellossom.asm" -MarillPokedexEntry:: INCLUDE "data/pokedex/entries/marill.asm" -AzumarillPokedexEntry:: INCLUDE "data/pokedex/entries/azumarill.asm" -SudowoodoPokedexEntry:: INCLUDE "data/pokedex/entries/sudowoodo.asm" -PolitoedPokedexEntry:: INCLUDE "data/pokedex/entries/politoed.asm" -HoppipPokedexEntry:: INCLUDE "data/pokedex/entries/hoppip.asm" -SkiploomPokedexEntry:: INCLUDE "data/pokedex/entries/skiploom.asm" -JumpluffPokedexEntry:: INCLUDE "data/pokedex/entries/jumpluff.asm" -AipomPokedexEntry:: INCLUDE "data/pokedex/entries/aipom.asm" -SunkernPokedexEntry:: INCLUDE "data/pokedex/entries/sunkern.asm" -SunfloraPokedexEntry:: INCLUDE "data/pokedex/entries/sunflora.asm" - - -SECTION "Pokedex Entries 193-251", ROMX - -PokedexEntries4:: -YanmaPokedexEntry:: INCLUDE "data/pokedex/entries/yanma.asm" -WooperPokedexEntry:: INCLUDE "data/pokedex/entries/wooper.asm" -QuagsirePokedexEntry:: INCLUDE "data/pokedex/entries/quagsire.asm" -EspeonPokedexEntry:: INCLUDE "data/pokedex/entries/espeon.asm" -UmbreonPokedexEntry:: INCLUDE "data/pokedex/entries/umbreon.asm" -MurkrowPokedexEntry:: INCLUDE "data/pokedex/entries/murkrow.asm" -SlowkingPokedexEntry:: INCLUDE "data/pokedex/entries/slowking.asm" -MisdreavusPokedexEntry:: INCLUDE "data/pokedex/entries/misdreavus.asm" -UnownPokedexEntry:: INCLUDE "data/pokedex/entries/unown.asm" -WobbuffetPokedexEntry:: INCLUDE "data/pokedex/entries/wobbuffet.asm" -GirafarigPokedexEntry:: INCLUDE "data/pokedex/entries/girafarig.asm" -PinecoPokedexEntry:: INCLUDE "data/pokedex/entries/pineco.asm" -ForretressPokedexEntry:: INCLUDE "data/pokedex/entries/forretress.asm" -DunsparcePokedexEntry:: INCLUDE "data/pokedex/entries/dunsparce.asm" -GligarPokedexEntry:: INCLUDE "data/pokedex/entries/gligar.asm" -SteelixPokedexEntry:: INCLUDE "data/pokedex/entries/steelix.asm" -SnubbullPokedexEntry:: INCLUDE "data/pokedex/entries/snubbull.asm" -GranbullPokedexEntry:: INCLUDE "data/pokedex/entries/granbull.asm" -QwilfishPokedexEntry:: INCLUDE "data/pokedex/entries/qwilfish.asm" -ScizorPokedexEntry:: INCLUDE "data/pokedex/entries/scizor.asm" -ShucklePokedexEntry:: INCLUDE "data/pokedex/entries/shuckle.asm" -HeracrossPokedexEntry:: INCLUDE "data/pokedex/entries/heracross.asm" -SneaselPokedexEntry:: INCLUDE "data/pokedex/entries/sneasel.asm" -TeddiursaPokedexEntry:: INCLUDE "data/pokedex/entries/teddiursa.asm" -UrsaringPokedexEntry:: INCLUDE "data/pokedex/entries/ursaring.asm" -SlugmaPokedexEntry:: INCLUDE "data/pokedex/entries/slugma.asm" -MagcargoPokedexEntry:: INCLUDE "data/pokedex/entries/magcargo.asm" -SwinubPokedexEntry:: INCLUDE "data/pokedex/entries/swinub.asm" -PiloswinePokedexEntry:: INCLUDE "data/pokedex/entries/piloswine.asm" -CorsolaPokedexEntry:: INCLUDE "data/pokedex/entries/corsola.asm" -RemoraidPokedexEntry:: INCLUDE "data/pokedex/entries/remoraid.asm" -OctilleryPokedexEntry:: INCLUDE "data/pokedex/entries/octillery.asm" -DelibirdPokedexEntry:: INCLUDE "data/pokedex/entries/delibird.asm" -MantinePokedexEntry:: INCLUDE "data/pokedex/entries/mantine.asm" -SkarmoryPokedexEntry:: INCLUDE "data/pokedex/entries/skarmory.asm" -HoundourPokedexEntry:: INCLUDE "data/pokedex/entries/houndour.asm" -HoundoomPokedexEntry:: INCLUDE "data/pokedex/entries/houndoom.asm" -KingdraPokedexEntry:: INCLUDE "data/pokedex/entries/kingdra.asm" -PhanpyPokedexEntry:: INCLUDE "data/pokedex/entries/phanpy.asm" -DonphanPokedexEntry:: INCLUDE "data/pokedex/entries/donphan.asm" -Porygon2PokedexEntry:: INCLUDE "data/pokedex/entries/porygon2.asm" -StantlerPokedexEntry:: INCLUDE "data/pokedex/entries/stantler.asm" -SmearglePokedexEntry:: INCLUDE "data/pokedex/entries/smeargle.asm" -TyroguePokedexEntry:: INCLUDE "data/pokedex/entries/tyrogue.asm" -HitmontopPokedexEntry:: INCLUDE "data/pokedex/entries/hitmontop.asm" -SmoochumPokedexEntry:: INCLUDE "data/pokedex/entries/smoochum.asm" -ElekidPokedexEntry:: INCLUDE "data/pokedex/entries/elekid.asm" -MagbyPokedexEntry:: INCLUDE "data/pokedex/entries/magby.asm" -MiltankPokedexEntry:: INCLUDE "data/pokedex/entries/miltank.asm" -BlisseyPokedexEntry:: INCLUDE "data/pokedex/entries/blissey.asm" -RaikouPokedexEntry:: INCLUDE "data/pokedex/entries/raikou.asm" -EnteiPokedexEntry:: INCLUDE "data/pokedex/entries/entei.asm" -SuicunePokedexEntry:: INCLUDE "data/pokedex/entries/suicune.asm" -LarvitarPokedexEntry:: INCLUDE "data/pokedex/entries/larvitar.asm" -PupitarPokedexEntry:: INCLUDE "data/pokedex/entries/pupitar.asm" -TyranitarPokedexEntry:: INCLUDE "data/pokedex/entries/tyranitar.asm" -LugiaPokedexEntry:: INCLUDE "data/pokedex/entries/lugia.asm" -HoOhPokedexEntry:: INCLUDE "data/pokedex/entries/ho_oh.asm" -CelebiPokedexEntry:: INCLUDE "data/pokedex/entries/celebi.asm" diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm new file mode 100644 index 000000000..8a6435a40 --- /dev/null +++ b/data/pokemon/base_stats.asm @@ -0,0 +1,252 @@ +BaseData:: +INCLUDE "data/pokemon/base_stats/bulbasaur.asm" +INCLUDE "data/pokemon/base_stats/ivysaur.asm" +INCLUDE "data/pokemon/base_stats/venusaur.asm" +INCLUDE "data/pokemon/base_stats/charmander.asm" +INCLUDE "data/pokemon/base_stats/charmeleon.asm" +INCLUDE "data/pokemon/base_stats/charizard.asm" +INCLUDE "data/pokemon/base_stats/squirtle.asm" +INCLUDE "data/pokemon/base_stats/wartortle.asm" +INCLUDE "data/pokemon/base_stats/blastoise.asm" +INCLUDE "data/pokemon/base_stats/caterpie.asm" +INCLUDE "data/pokemon/base_stats/metapod.asm" +INCLUDE "data/pokemon/base_stats/butterfree.asm" +INCLUDE "data/pokemon/base_stats/weedle.asm" +INCLUDE "data/pokemon/base_stats/kakuna.asm" +INCLUDE "data/pokemon/base_stats/beedrill.asm" +INCLUDE "data/pokemon/base_stats/pidgey.asm" +INCLUDE "data/pokemon/base_stats/pidgeotto.asm" +INCLUDE "data/pokemon/base_stats/pidgeot.asm" +INCLUDE "data/pokemon/base_stats/rattata.asm" +INCLUDE "data/pokemon/base_stats/raticate.asm" +INCLUDE "data/pokemon/base_stats/spearow.asm" +INCLUDE "data/pokemon/base_stats/fearow.asm" +INCLUDE "data/pokemon/base_stats/ekans.asm" +INCLUDE "data/pokemon/base_stats/arbok.asm" +INCLUDE "data/pokemon/base_stats/pikachu.asm" +INCLUDE "data/pokemon/base_stats/raichu.asm" +INCLUDE "data/pokemon/base_stats/sandshrew.asm" +INCLUDE "data/pokemon/base_stats/sandslash.asm" +INCLUDE "data/pokemon/base_stats/nidoran_f.asm" +INCLUDE "data/pokemon/base_stats/nidorina.asm" +INCLUDE "data/pokemon/base_stats/nidoqueen.asm" +INCLUDE "data/pokemon/base_stats/nidoran_m.asm" +INCLUDE "data/pokemon/base_stats/nidorino.asm" +INCLUDE "data/pokemon/base_stats/nidoking.asm" +INCLUDE "data/pokemon/base_stats/clefairy.asm" +INCLUDE "data/pokemon/base_stats/clefable.asm" +INCLUDE "data/pokemon/base_stats/vulpix.asm" +INCLUDE "data/pokemon/base_stats/ninetales.asm" +INCLUDE "data/pokemon/base_stats/jigglypuff.asm" +INCLUDE "data/pokemon/base_stats/wigglytuff.asm" +INCLUDE "data/pokemon/base_stats/zubat.asm" +INCLUDE "data/pokemon/base_stats/golbat.asm" +INCLUDE "data/pokemon/base_stats/oddish.asm" +INCLUDE "data/pokemon/base_stats/gloom.asm" +INCLUDE "data/pokemon/base_stats/vileplume.asm" +INCLUDE "data/pokemon/base_stats/paras.asm" +INCLUDE "data/pokemon/base_stats/parasect.asm" +INCLUDE "data/pokemon/base_stats/venonat.asm" +INCLUDE "data/pokemon/base_stats/venomoth.asm" +INCLUDE "data/pokemon/base_stats/diglett.asm" +INCLUDE "data/pokemon/base_stats/dugtrio.asm" +INCLUDE "data/pokemon/base_stats/meowth.asm" +INCLUDE "data/pokemon/base_stats/persian.asm" +INCLUDE "data/pokemon/base_stats/psyduck.asm" +INCLUDE "data/pokemon/base_stats/golduck.asm" +INCLUDE "data/pokemon/base_stats/mankey.asm" +INCLUDE "data/pokemon/base_stats/primeape.asm" +INCLUDE "data/pokemon/base_stats/growlithe.asm" +INCLUDE "data/pokemon/base_stats/arcanine.asm" +INCLUDE "data/pokemon/base_stats/poliwag.asm" +INCLUDE "data/pokemon/base_stats/poliwhirl.asm" +INCLUDE "data/pokemon/base_stats/poliwrath.asm" +INCLUDE "data/pokemon/base_stats/abra.asm" +INCLUDE "data/pokemon/base_stats/kadabra.asm" +INCLUDE "data/pokemon/base_stats/alakazam.asm" +INCLUDE "data/pokemon/base_stats/machop.asm" +INCLUDE "data/pokemon/base_stats/machoke.asm" +INCLUDE "data/pokemon/base_stats/machamp.asm" +INCLUDE "data/pokemon/base_stats/bellsprout.asm" +INCLUDE "data/pokemon/base_stats/weepinbell.asm" +INCLUDE "data/pokemon/base_stats/victreebel.asm" +INCLUDE "data/pokemon/base_stats/tentacool.asm" +INCLUDE "data/pokemon/base_stats/tentacruel.asm" +INCLUDE "data/pokemon/base_stats/geodude.asm" +INCLUDE "data/pokemon/base_stats/graveler.asm" +INCLUDE "data/pokemon/base_stats/golem.asm" +INCLUDE "data/pokemon/base_stats/ponyta.asm" +INCLUDE "data/pokemon/base_stats/rapidash.asm" +INCLUDE "data/pokemon/base_stats/slowpoke.asm" +INCLUDE "data/pokemon/base_stats/slowbro.asm" +INCLUDE "data/pokemon/base_stats/magnemite.asm" +INCLUDE "data/pokemon/base_stats/magneton.asm" +INCLUDE "data/pokemon/base_stats/farfetch_d.asm" +INCLUDE "data/pokemon/base_stats/doduo.asm" +INCLUDE "data/pokemon/base_stats/dodrio.asm" +INCLUDE "data/pokemon/base_stats/seel.asm" +INCLUDE "data/pokemon/base_stats/dewgong.asm" +INCLUDE "data/pokemon/base_stats/grimer.asm" +INCLUDE "data/pokemon/base_stats/muk.asm" +INCLUDE "data/pokemon/base_stats/shellder.asm" +INCLUDE "data/pokemon/base_stats/cloyster.asm" +INCLUDE "data/pokemon/base_stats/gastly.asm" +INCLUDE "data/pokemon/base_stats/haunter.asm" +INCLUDE "data/pokemon/base_stats/gengar.asm" +INCLUDE "data/pokemon/base_stats/onix.asm" +INCLUDE "data/pokemon/base_stats/drowzee.asm" +INCLUDE "data/pokemon/base_stats/hypno.asm" +INCLUDE "data/pokemon/base_stats/krabby.asm" +INCLUDE "data/pokemon/base_stats/kingler.asm" +INCLUDE "data/pokemon/base_stats/voltorb.asm" +INCLUDE "data/pokemon/base_stats/electrode.asm" +INCLUDE "data/pokemon/base_stats/exeggcute.asm" +INCLUDE "data/pokemon/base_stats/exeggutor.asm" +INCLUDE "data/pokemon/base_stats/cubone.asm" +INCLUDE "data/pokemon/base_stats/marowak.asm" +INCLUDE "data/pokemon/base_stats/hitmonlee.asm" +INCLUDE "data/pokemon/base_stats/hitmonchan.asm" +INCLUDE "data/pokemon/base_stats/lickitung.asm" +INCLUDE "data/pokemon/base_stats/koffing.asm" +INCLUDE "data/pokemon/base_stats/weezing.asm" +INCLUDE "data/pokemon/base_stats/rhyhorn.asm" +INCLUDE "data/pokemon/base_stats/rhydon.asm" +INCLUDE "data/pokemon/base_stats/chansey.asm" +INCLUDE "data/pokemon/base_stats/tangela.asm" +INCLUDE "data/pokemon/base_stats/kangaskhan.asm" +INCLUDE "data/pokemon/base_stats/horsea.asm" +INCLUDE "data/pokemon/base_stats/seadra.asm" +INCLUDE "data/pokemon/base_stats/goldeen.asm" +INCLUDE "data/pokemon/base_stats/seaking.asm" +INCLUDE "data/pokemon/base_stats/staryu.asm" +INCLUDE "data/pokemon/base_stats/starmie.asm" +INCLUDE "data/pokemon/base_stats/mr__mime.asm" +INCLUDE "data/pokemon/base_stats/scyther.asm" +INCLUDE "data/pokemon/base_stats/jynx.asm" +INCLUDE "data/pokemon/base_stats/electabuzz.asm" +INCLUDE "data/pokemon/base_stats/magmar.asm" +INCLUDE "data/pokemon/base_stats/pinsir.asm" +INCLUDE "data/pokemon/base_stats/tauros.asm" +INCLUDE "data/pokemon/base_stats/magikarp.asm" +INCLUDE "data/pokemon/base_stats/gyarados.asm" +INCLUDE "data/pokemon/base_stats/lapras.asm" +INCLUDE "data/pokemon/base_stats/ditto.asm" +INCLUDE "data/pokemon/base_stats/eevee.asm" +INCLUDE "data/pokemon/base_stats/vaporeon.asm" +INCLUDE "data/pokemon/base_stats/jolteon.asm" +INCLUDE "data/pokemon/base_stats/flareon.asm" +INCLUDE "data/pokemon/base_stats/porygon.asm" +INCLUDE "data/pokemon/base_stats/omanyte.asm" +INCLUDE "data/pokemon/base_stats/omastar.asm" +INCLUDE "data/pokemon/base_stats/kabuto.asm" +INCLUDE "data/pokemon/base_stats/kabutops.asm" +INCLUDE "data/pokemon/base_stats/aerodactyl.asm" +INCLUDE "data/pokemon/base_stats/snorlax.asm" +INCLUDE "data/pokemon/base_stats/articuno.asm" +INCLUDE "data/pokemon/base_stats/zapdos.asm" +INCLUDE "data/pokemon/base_stats/moltres.asm" +INCLUDE "data/pokemon/base_stats/dratini.asm" +INCLUDE "data/pokemon/base_stats/dragonair.asm" +INCLUDE "data/pokemon/base_stats/dragonite.asm" +INCLUDE "data/pokemon/base_stats/mewtwo.asm" +INCLUDE "data/pokemon/base_stats/mew.asm" +INCLUDE "data/pokemon/base_stats/chikorita.asm" +INCLUDE "data/pokemon/base_stats/bayleef.asm" +INCLUDE "data/pokemon/base_stats/meganium.asm" +INCLUDE "data/pokemon/base_stats/cyndaquil.asm" +INCLUDE "data/pokemon/base_stats/quilava.asm" +INCLUDE "data/pokemon/base_stats/typhlosion.asm" +INCLUDE "data/pokemon/base_stats/totodile.asm" +INCLUDE "data/pokemon/base_stats/croconaw.asm" +INCLUDE "data/pokemon/base_stats/feraligatr.asm" +INCLUDE "data/pokemon/base_stats/sentret.asm" +INCLUDE "data/pokemon/base_stats/furret.asm" +INCLUDE "data/pokemon/base_stats/hoothoot.asm" +INCLUDE "data/pokemon/base_stats/noctowl.asm" +INCLUDE "data/pokemon/base_stats/ledyba.asm" +INCLUDE "data/pokemon/base_stats/ledian.asm" +INCLUDE "data/pokemon/base_stats/spinarak.asm" +INCLUDE "data/pokemon/base_stats/ariados.asm" +INCLUDE "data/pokemon/base_stats/crobat.asm" +INCLUDE "data/pokemon/base_stats/chinchou.asm" +INCLUDE "data/pokemon/base_stats/lanturn.asm" +INCLUDE "data/pokemon/base_stats/pichu.asm" +INCLUDE "data/pokemon/base_stats/cleffa.asm" +INCLUDE "data/pokemon/base_stats/igglybuff.asm" +INCLUDE "data/pokemon/base_stats/togepi.asm" +INCLUDE "data/pokemon/base_stats/togetic.asm" +INCLUDE "data/pokemon/base_stats/natu.asm" +INCLUDE "data/pokemon/base_stats/xatu.asm" +INCLUDE "data/pokemon/base_stats/mareep.asm" +INCLUDE "data/pokemon/base_stats/flaaffy.asm" +INCLUDE "data/pokemon/base_stats/ampharos.asm" +INCLUDE "data/pokemon/base_stats/bellossom.asm" +INCLUDE "data/pokemon/base_stats/marill.asm" +INCLUDE "data/pokemon/base_stats/azumarill.asm" +INCLUDE "data/pokemon/base_stats/sudowoodo.asm" +INCLUDE "data/pokemon/base_stats/politoed.asm" +INCLUDE "data/pokemon/base_stats/hoppip.asm" +INCLUDE "data/pokemon/base_stats/skiploom.asm" +INCLUDE "data/pokemon/base_stats/jumpluff.asm" +INCLUDE "data/pokemon/base_stats/aipom.asm" +INCLUDE "data/pokemon/base_stats/sunkern.asm" +INCLUDE "data/pokemon/base_stats/sunflora.asm" +INCLUDE "data/pokemon/base_stats/yanma.asm" +INCLUDE "data/pokemon/base_stats/wooper.asm" +INCLUDE "data/pokemon/base_stats/quagsire.asm" +INCLUDE "data/pokemon/base_stats/espeon.asm" +INCLUDE "data/pokemon/base_stats/umbreon.asm" +INCLUDE "data/pokemon/base_stats/murkrow.asm" +INCLUDE "data/pokemon/base_stats/slowking.asm" +INCLUDE "data/pokemon/base_stats/misdreavus.asm" +INCLUDE "data/pokemon/base_stats/unown.asm" +INCLUDE "data/pokemon/base_stats/wobbuffet.asm" +INCLUDE "data/pokemon/base_stats/girafarig.asm" +INCLUDE "data/pokemon/base_stats/pineco.asm" +INCLUDE "data/pokemon/base_stats/forretress.asm" +INCLUDE "data/pokemon/base_stats/dunsparce.asm" +INCLUDE "data/pokemon/base_stats/gligar.asm" +INCLUDE "data/pokemon/base_stats/steelix.asm" +INCLUDE "data/pokemon/base_stats/snubbull.asm" +INCLUDE "data/pokemon/base_stats/granbull.asm" +INCLUDE "data/pokemon/base_stats/qwilfish.asm" +INCLUDE "data/pokemon/base_stats/scizor.asm" +INCLUDE "data/pokemon/base_stats/shuckle.asm" +INCLUDE "data/pokemon/base_stats/heracross.asm" +INCLUDE "data/pokemon/base_stats/sneasel.asm" +INCLUDE "data/pokemon/base_stats/teddiursa.asm" +INCLUDE "data/pokemon/base_stats/ursaring.asm" +INCLUDE "data/pokemon/base_stats/slugma.asm" +INCLUDE "data/pokemon/base_stats/magcargo.asm" +INCLUDE "data/pokemon/base_stats/swinub.asm" +INCLUDE "data/pokemon/base_stats/piloswine.asm" +INCLUDE "data/pokemon/base_stats/corsola.asm" +INCLUDE "data/pokemon/base_stats/remoraid.asm" +INCLUDE "data/pokemon/base_stats/octillery.asm" +INCLUDE "data/pokemon/base_stats/delibird.asm" +INCLUDE "data/pokemon/base_stats/mantine.asm" +INCLUDE "data/pokemon/base_stats/skarmory.asm" +INCLUDE "data/pokemon/base_stats/houndour.asm" +INCLUDE "data/pokemon/base_stats/houndoom.asm" +INCLUDE "data/pokemon/base_stats/kingdra.asm" +INCLUDE "data/pokemon/base_stats/phanpy.asm" +INCLUDE "data/pokemon/base_stats/donphan.asm" +INCLUDE "data/pokemon/base_stats/porygon2.asm" +INCLUDE "data/pokemon/base_stats/stantler.asm" +INCLUDE "data/pokemon/base_stats/smeargle.asm" +INCLUDE "data/pokemon/base_stats/tyrogue.asm" +INCLUDE "data/pokemon/base_stats/hitmontop.asm" +INCLUDE "data/pokemon/base_stats/smoochum.asm" +INCLUDE "data/pokemon/base_stats/elekid.asm" +INCLUDE "data/pokemon/base_stats/magby.asm" +INCLUDE "data/pokemon/base_stats/miltank.asm" +INCLUDE "data/pokemon/base_stats/blissey.asm" +INCLUDE "data/pokemon/base_stats/raikou.asm" +INCLUDE "data/pokemon/base_stats/entei.asm" +INCLUDE "data/pokemon/base_stats/suicune.asm" +INCLUDE "data/pokemon/base_stats/larvitar.asm" +INCLUDE "data/pokemon/base_stats/pupitar.asm" +INCLUDE "data/pokemon/base_stats/tyranitar.asm" +INCLUDE "data/pokemon/base_stats/lugia.asm" +INCLUDE "data/pokemon/base_stats/ho_oh.asm" +INCLUDE "data/pokemon/base_stats/celebi.asm" diff --git a/data/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm similarity index 96% rename from data/base_stats/abra.asm rename to data/pokemon/base_stats/abra.asm index f3a39edbb..a2520320a 100644 --- a/data/base_stats/abra.asm +++ b/data/pokemon/base_stats/abra.asm @@ -8,7 +8,7 @@ db 73 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm similarity index 96% rename from data/base_stats/aerodactyl.asm rename to data/pokemon/base_stats/aerodactyl.asm index 56530206c..897311399 100644 --- a/data/base_stats/aerodactyl.asm +++ b/data/pokemon/base_stats/aerodactyl.asm @@ -8,7 +8,7 @@ db 202 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/aipom.asm b/data/pokemon/base_stats/aipom.asm similarity index 96% rename from data/base_stats/aipom.asm rename to data/pokemon/base_stats/aipom.asm index aa9ca45a1..839bff358 100644 --- a/data/base_stats/aipom.asm +++ b/data/pokemon/base_stats/aipom.asm @@ -8,7 +8,7 @@ db 94 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm similarity index 96% rename from data/base_stats/alakazam.asm rename to data/pokemon/base_stats/alakazam.asm index 79e2e99ee..d0647e268 100644 --- a/data/base_stats/alakazam.asm +++ b/data/pokemon/base_stats/alakazam.asm @@ -8,7 +8,7 @@ db 186 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ampharos.asm b/data/pokemon/base_stats/ampharos.asm similarity index 96% rename from data/base_stats/ampharos.asm rename to data/pokemon/base_stats/ampharos.asm index a0a2c48f7..ec361a08d 100644 --- a/data/base_stats/ampharos.asm +++ b/data/pokemon/base_stats/ampharos.asm @@ -8,7 +8,7 @@ db 194 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm similarity index 96% rename from data/base_stats/arbok.asm rename to data/pokemon/base_stats/arbok.asm index 48129fc36..ed84e5dc8 100644 --- a/data/base_stats/arbok.asm +++ b/data/pokemon/base_stats/arbok.asm @@ -8,7 +8,7 @@ db 147 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm similarity index 96% rename from data/base_stats/arcanine.asm rename to data/pokemon/base_stats/arcanine.asm index 81452dd19..d543bb8da 100644 --- a/data/base_stats/arcanine.asm +++ b/data/pokemon/base_stats/arcanine.asm @@ -8,7 +8,7 @@ db 213 ; base exp db BURNT_BERRY ; item 1 db BURNT_BERRY ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ariados.asm b/data/pokemon/base_stats/ariados.asm similarity index 96% rename from data/base_stats/ariados.asm rename to data/pokemon/base_stats/ariados.asm index 244c70d86..8a436f624 100644 --- a/data/base_stats/ariados.asm +++ b/data/pokemon/base_stats/ariados.asm @@ -8,7 +8,7 @@ db 134 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm similarity index 96% rename from data/base_stats/articuno.asm rename to data/pokemon/base_stats/articuno.asm index 320e210c6..ddf85599b 100644 --- a/data/base_stats/articuno.asm +++ b/data/pokemon/base_stats/articuno.asm @@ -8,7 +8,7 @@ db 215 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/azumarill.asm b/data/pokemon/base_stats/azumarill.asm similarity index 96% rename from data/base_stats/azumarill.asm rename to data/pokemon/base_stats/azumarill.asm index c18e517c4..c4286ad5d 100644 --- a/data/base_stats/azumarill.asm +++ b/data/pokemon/base_stats/azumarill.asm @@ -8,7 +8,7 @@ db 153 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/bayleef.asm b/data/pokemon/base_stats/bayleef.asm similarity index 96% rename from data/base_stats/bayleef.asm rename to data/pokemon/base_stats/bayleef.asm index bb439ccd3..82caf4ae7 100644 --- a/data/base_stats/bayleef.asm +++ b/data/pokemon/base_stats/bayleef.asm @@ -8,7 +8,7 @@ db 141 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm similarity index 96% rename from data/base_stats/beedrill.asm rename to data/pokemon/base_stats/beedrill.asm index 465b076de..c76accff8 100644 --- a/data/base_stats/beedrill.asm +++ b/data/pokemon/base_stats/beedrill.asm @@ -8,7 +8,7 @@ db 159 ; base exp db NO_ITEM ; item 1 db POISON_BARB ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm similarity index 96% rename from data/base_stats/bellossom.asm rename to data/pokemon/base_stats/bellossom.asm index 6489fe50c..9131b2b38 100644 --- a/data/base_stats/bellossom.asm +++ b/data/pokemon/base_stats/bellossom.asm @@ -8,7 +8,7 @@ db 184 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm similarity index 96% rename from data/base_stats/bellsprout.asm rename to data/pokemon/base_stats/bellsprout.asm index d8e3160e6..94a8ded6b 100644 --- a/data/base_stats/bellsprout.asm +++ b/data/pokemon/base_stats/bellsprout.asm @@ -8,7 +8,7 @@ db 84 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm similarity index 96% rename from data/base_stats/blastoise.asm rename to data/pokemon/base_stats/blastoise.asm index 1a2df93b3..7bb267d72 100644 --- a/data/base_stats/blastoise.asm +++ b/data/pokemon/base_stats/blastoise.asm @@ -8,7 +8,7 @@ db 210 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/blissey.asm b/data/pokemon/base_stats/blissey.asm similarity index 96% rename from data/base_stats/blissey.asm rename to data/pokemon/base_stats/blissey.asm index d9c870da4..dc1c9a02b 100644 --- a/data/base_stats/blissey.asm +++ b/data/pokemon/base_stats/blissey.asm @@ -8,7 +8,7 @@ db 255 ; base exp db NO_ITEM ; item 1 db LUCKY_EGG ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm similarity index 96% rename from data/base_stats/bulbasaur.asm rename to data/pokemon/base_stats/bulbasaur.asm index eb4bec3f6..bc843bcd3 100644 --- a/data/base_stats/bulbasaur.asm +++ b/data/pokemon/base_stats/bulbasaur.asm @@ -8,7 +8,7 @@ db 64 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm similarity index 96% rename from data/base_stats/butterfree.asm rename to data/pokemon/base_stats/butterfree.asm index ca1609d1e..24b142e60 100644 --- a/data/base_stats/butterfree.asm +++ b/data/pokemon/base_stats/butterfree.asm @@ -8,7 +8,7 @@ db 160 ; base exp db NO_ITEM ; item 1 db SILVERPOWDER ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm similarity index 94% rename from data/base_stats/caterpie.asm rename to data/pokemon/base_stats/caterpie.asm index 47e0b5210..cdac5bf26 100644 --- a/data/base_stats/caterpie.asm +++ b/data/pokemon/base_stats/caterpie.asm @@ -8,7 +8,7 @@ db 53 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm similarity index 96% rename from data/base_stats/celebi.asm rename to data/pokemon/base_stats/celebi.asm index 2a09691bd..c955ae2a1 100644 --- a/data/base_stats/celebi.asm +++ b/data/pokemon/base_stats/celebi.asm @@ -8,7 +8,7 @@ db 64 ; base exp db NO_ITEM ; item 1 db MIRACLEBERRY ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 120 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm similarity index 96% rename from data/base_stats/chansey.asm rename to data/pokemon/base_stats/chansey.asm index 2ba6091f9..1ae3af6fe 100644 --- a/data/base_stats/chansey.asm +++ b/data/pokemon/base_stats/chansey.asm @@ -8,7 +8,7 @@ db 255 ; base exp db NO_ITEM ; item 1 db LUCKY_EGG ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm similarity index 96% rename from data/base_stats/charizard.asm rename to data/pokemon/base_stats/charizard.asm index d8b1ee769..8d32f3f91 100644 --- a/data/base_stats/charizard.asm +++ b/data/pokemon/base_stats/charizard.asm @@ -8,7 +8,7 @@ db 209 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm similarity index 96% rename from data/base_stats/charmander.asm rename to data/pokemon/base_stats/charmander.asm index ba6822529..98383865c 100644 --- a/data/base_stats/charmander.asm +++ b/data/pokemon/base_stats/charmander.asm @@ -8,7 +8,7 @@ db 65 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm similarity index 96% rename from data/base_stats/charmeleon.asm rename to data/pokemon/base_stats/charmeleon.asm index 0be9be06f..9f7f32b51 100644 --- a/data/base_stats/charmeleon.asm +++ b/data/pokemon/base_stats/charmeleon.asm @@ -8,7 +8,7 @@ db 142 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/chikorita.asm b/data/pokemon/base_stats/chikorita.asm similarity index 95% rename from data/base_stats/chikorita.asm rename to data/pokemon/base_stats/chikorita.asm index 74f77ae8f..fdf120402 100644 --- a/data/base_stats/chikorita.asm +++ b/data/pokemon/base_stats/chikorita.asm @@ -8,7 +8,7 @@ db 64 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/chinchou.asm b/data/pokemon/base_stats/chinchou.asm similarity index 96% rename from data/base_stats/chinchou.asm rename to data/pokemon/base_stats/chinchou.asm index 13fb43872..caa5d06e1 100644 --- a/data/base_stats/chinchou.asm +++ b/data/pokemon/base_stats/chinchou.asm @@ -8,7 +8,7 @@ db 90 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm similarity index 97% rename from data/base_stats/clefable.asm rename to data/pokemon/base_stats/clefable.asm index ffa07d9dc..e5978e387 100644 --- a/data/base_stats/clefable.asm +++ b/data/pokemon/base_stats/clefable.asm @@ -8,7 +8,7 @@ db 129 ; base exp db MYSTERYBERRY ; item 1 db MOON_STONE ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm similarity index 97% rename from data/base_stats/clefairy.asm rename to data/pokemon/base_stats/clefairy.asm index ee1f38d04..54089b5cc 100644 --- a/data/base_stats/clefairy.asm +++ b/data/pokemon/base_stats/clefairy.asm @@ -8,7 +8,7 @@ db 68 ; base exp db MYSTERYBERRY ; item 1 db MOON_STONE ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/cleffa.asm b/data/pokemon/base_stats/cleffa.asm similarity index 96% rename from data/base_stats/cleffa.asm rename to data/pokemon/base_stats/cleffa.asm index 3afb4c6c6..98e77e968 100644 --- a/data/base_stats/cleffa.asm +++ b/data/pokemon/base_stats/cleffa.asm @@ -8,7 +8,7 @@ db 37 ; base exp db MYSTERYBERRY ; item 1 db MOON_STONE ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm similarity index 96% rename from data/base_stats/cloyster.asm rename to data/pokemon/base_stats/cloyster.asm index f7de0467d..4119dbec2 100644 --- a/data/base_stats/cloyster.asm +++ b/data/pokemon/base_stats/cloyster.asm @@ -8,7 +8,7 @@ db 203 ; base exp db PEARL ; item 1 db BIG_PEARL ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/corsola.asm b/data/pokemon/base_stats/corsola.asm similarity index 96% rename from data/base_stats/corsola.asm rename to data/pokemon/base_stats/corsola.asm index 5a3adde57..dddf30644 100644 --- a/data/base_stats/corsola.asm +++ b/data/pokemon/base_stats/corsola.asm @@ -8,7 +8,7 @@ db 113 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm similarity index 96% rename from data/base_stats/crobat.asm rename to data/pokemon/base_stats/crobat.asm index 923ca38a9..71c012079 100644 --- a/data/base_stats/crobat.asm +++ b/data/pokemon/base_stats/crobat.asm @@ -8,7 +8,7 @@ db 204 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/croconaw.asm b/data/pokemon/base_stats/croconaw.asm similarity index 96% rename from data/base_stats/croconaw.asm rename to data/pokemon/base_stats/croconaw.asm index 66fb9f10c..8dbd57632 100644 --- a/data/base_stats/croconaw.asm +++ b/data/pokemon/base_stats/croconaw.asm @@ -8,7 +8,7 @@ db 143 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm similarity index 96% rename from data/base_stats/cubone.asm rename to data/pokemon/base_stats/cubone.asm index 7c8d32d82..dc15c8773 100644 --- a/data/base_stats/cubone.asm +++ b/data/pokemon/base_stats/cubone.asm @@ -8,7 +8,7 @@ db 87 ; base exp db NO_ITEM ; item 1 db THICK_CLUB ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/cyndaquil.asm b/data/pokemon/base_stats/cyndaquil.asm similarity index 96% rename from data/base_stats/cyndaquil.asm rename to data/pokemon/base_stats/cyndaquil.asm index b1f294907..137e8c78d 100644 --- a/data/base_stats/cyndaquil.asm +++ b/data/pokemon/base_stats/cyndaquil.asm @@ -8,7 +8,7 @@ db 65 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/delibird.asm b/data/pokemon/base_stats/delibird.asm similarity index 96% rename from data/base_stats/delibird.asm rename to data/pokemon/base_stats/delibird.asm index 139bfb66b..8ddb23e7c 100644 --- a/data/base_stats/delibird.asm +++ b/data/pokemon/base_stats/delibird.asm @@ -8,7 +8,7 @@ db 183 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm similarity index 96% rename from data/base_stats/dewgong.asm rename to data/pokemon/base_stats/dewgong.asm index e73de86b3..951a1e87e 100644 --- a/data/base_stats/dewgong.asm +++ b/data/pokemon/base_stats/dewgong.asm @@ -8,7 +8,7 @@ db 176 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm similarity index 96% rename from data/base_stats/diglett.asm rename to data/pokemon/base_stats/diglett.asm index 9e9005114..b93947622 100644 --- a/data/base_stats/diglett.asm +++ b/data/pokemon/base_stats/diglett.asm @@ -8,7 +8,7 @@ db 81 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm similarity index 94% rename from data/base_stats/ditto.asm rename to data/pokemon/base_stats/ditto.asm index 6cbbe60ca..b88780bed 100644 --- a/data/base_stats/ditto.asm +++ b/data/pokemon/base_stats/ditto.asm @@ -8,7 +8,7 @@ db 61 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm similarity index 96% rename from data/base_stats/dodrio.asm rename to data/pokemon/base_stats/dodrio.asm index dd96b10aa..6f8463663 100644 --- a/data/base_stats/dodrio.asm +++ b/data/pokemon/base_stats/dodrio.asm @@ -8,7 +8,7 @@ db 158 ; base exp db NO_ITEM ; item 1 db SHARP_BEAK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm similarity index 95% rename from data/base_stats/doduo.asm rename to data/pokemon/base_stats/doduo.asm index 02c1e792a..1ef229455 100644 --- a/data/base_stats/doduo.asm +++ b/data/pokemon/base_stats/doduo.asm @@ -8,7 +8,7 @@ db 96 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/donphan.asm b/data/pokemon/base_stats/donphan.asm similarity index 96% rename from data/base_stats/donphan.asm rename to data/pokemon/base_stats/donphan.asm index 6e66787e1..ee0418de0 100644 --- a/data/base_stats/donphan.asm +++ b/data/pokemon/base_stats/donphan.asm @@ -8,7 +8,7 @@ db 189 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm similarity index 96% rename from data/base_stats/dragonair.asm rename to data/pokemon/base_stats/dragonair.asm index 621b50d51..e0ca4b8e9 100644 --- a/data/base_stats/dragonair.asm +++ b/data/pokemon/base_stats/dragonair.asm @@ -8,7 +8,7 @@ db 144 ; base exp db NO_ITEM ; item 1 db DRAGON_SCALE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm similarity index 97% rename from data/base_stats/dragonite.asm rename to data/pokemon/base_stats/dragonite.asm index 83bbbb3eb..8ca777e96 100644 --- a/data/base_stats/dragonite.asm +++ b/data/pokemon/base_stats/dragonite.asm @@ -8,7 +8,7 @@ db 218 ; base exp db NO_ITEM ; item 1 db DRAGON_SCALE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm similarity index 96% rename from data/base_stats/dratini.asm rename to data/pokemon/base_stats/dratini.asm index f9cf27faf..c1c173c86 100644 --- a/data/base_stats/dratini.asm +++ b/data/pokemon/base_stats/dratini.asm @@ -8,7 +8,7 @@ db 67 ; base exp db NO_ITEM ; item 1 db DRAGON_SCALE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm similarity index 96% rename from data/base_stats/drowzee.asm rename to data/pokemon/base_stats/drowzee.asm index 04d7780bb..5aa756351 100644 --- a/data/base_stats/drowzee.asm +++ b/data/pokemon/base_stats/drowzee.asm @@ -8,7 +8,7 @@ db 102 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm similarity index 96% rename from data/base_stats/dugtrio.asm rename to data/pokemon/base_stats/dugtrio.asm index 402cc6c03..e245f8320 100644 --- a/data/base_stats/dugtrio.asm +++ b/data/pokemon/base_stats/dugtrio.asm @@ -8,7 +8,7 @@ db 153 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/dunsparce.asm b/data/pokemon/base_stats/dunsparce.asm similarity index 96% rename from data/base_stats/dunsparce.asm rename to data/pokemon/base_stats/dunsparce.asm index e3ed6a9df..5cbdb5807 100644 --- a/data/base_stats/dunsparce.asm +++ b/data/pokemon/base_stats/dunsparce.asm @@ -8,7 +8,7 @@ db 75 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm similarity index 95% rename from data/base_stats/eevee.asm rename to data/pokemon/base_stats/eevee.asm index 44584c15d..79bbafbcf 100644 --- a/data/base_stats/eevee.asm +++ b/data/pokemon/base_stats/eevee.asm @@ -8,7 +8,7 @@ db 92 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm similarity index 96% rename from data/base_stats/ekans.asm rename to data/pokemon/base_stats/ekans.asm index 0876d169a..0aa84fde2 100644 --- a/data/base_stats/ekans.asm +++ b/data/pokemon/base_stats/ekans.asm @@ -8,7 +8,7 @@ db 62 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm similarity index 96% rename from data/base_stats/electabuzz.asm rename to data/pokemon/base_stats/electabuzz.asm index 7b690eae2..29cdf9018 100644 --- a/data/base_stats/electabuzz.asm +++ b/data/pokemon/base_stats/electabuzz.asm @@ -8,7 +8,7 @@ db 156 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm similarity index 96% rename from data/base_stats/electrode.asm rename to data/pokemon/base_stats/electrode.asm index 3c2895384..44d92de66 100644 --- a/data/base_stats/electrode.asm +++ b/data/pokemon/base_stats/electrode.asm @@ -8,7 +8,7 @@ db 150 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/elekid.asm b/data/pokemon/base_stats/elekid.asm similarity index 96% rename from data/base_stats/elekid.asm rename to data/pokemon/base_stats/elekid.asm index 9fae865c6..a1f871586 100644 --- a/data/base_stats/elekid.asm +++ b/data/pokemon/base_stats/elekid.asm @@ -8,7 +8,7 @@ db 106 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm similarity index 96% rename from data/base_stats/entei.asm rename to data/pokemon/base_stats/entei.asm index c05954720..63f5f0af6 100644 --- a/data/base_stats/entei.asm +++ b/data/pokemon/base_stats/entei.asm @@ -8,7 +8,7 @@ db 217 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm similarity index 96% rename from data/base_stats/espeon.asm rename to data/pokemon/base_stats/espeon.asm index deebb0902..5748ded74 100644 --- a/data/base_stats/espeon.asm +++ b/data/pokemon/base_stats/espeon.asm @@ -8,7 +8,7 @@ db 197 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm similarity index 96% rename from data/base_stats/exeggcute.asm rename to data/pokemon/base_stats/exeggcute.asm index 95daf462b..3cd83b6c9 100644 --- a/data/base_stats/exeggcute.asm +++ b/data/pokemon/base_stats/exeggcute.asm @@ -8,7 +8,7 @@ db 98 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm similarity index 96% rename from data/base_stats/exeggutor.asm rename to data/pokemon/base_stats/exeggutor.asm index d7561e6eb..d5c466f21 100644 --- a/data/base_stats/exeggutor.asm +++ b/data/pokemon/base_stats/exeggutor.asm @@ -8,7 +8,7 @@ db 212 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/farfetch_d.asm b/data/pokemon/base_stats/farfetch_d.asm similarity index 96% rename from data/base_stats/farfetch_d.asm rename to data/pokemon/base_stats/farfetch_d.asm index 2ab5fb9e8..8da2b08a4 100644 --- a/data/base_stats/farfetch_d.asm +++ b/data/pokemon/base_stats/farfetch_d.asm @@ -8,7 +8,7 @@ db 94 ; base exp db NO_ITEM ; item 1 db STICK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm similarity index 96% rename from data/base_stats/fearow.asm rename to data/pokemon/base_stats/fearow.asm index 6cb670332..2ce86b1bf 100644 --- a/data/base_stats/fearow.asm +++ b/data/pokemon/base_stats/fearow.asm @@ -8,7 +8,7 @@ db 162 ; base exp db NO_ITEM ; item 1 db SHARP_BEAK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/feraligatr.asm b/data/pokemon/base_stats/feraligatr.asm similarity index 96% rename from data/base_stats/feraligatr.asm rename to data/pokemon/base_stats/feraligatr.asm index 758fdb1da..c59ca6ffb 100644 --- a/data/base_stats/feraligatr.asm +++ b/data/pokemon/base_stats/feraligatr.asm @@ -8,7 +8,7 @@ db 210 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/flaaffy.asm b/data/pokemon/base_stats/flaaffy.asm similarity index 96% rename from data/base_stats/flaaffy.asm rename to data/pokemon/base_stats/flaaffy.asm index 936ee3b1d..2cf5e15bc 100644 --- a/data/base_stats/flaaffy.asm +++ b/data/pokemon/base_stats/flaaffy.asm @@ -8,7 +8,7 @@ db 117 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm similarity index 96% rename from data/base_stats/flareon.asm rename to data/pokemon/base_stats/flareon.asm index 345b9a385..00faecec6 100644 --- a/data/base_stats/flareon.asm +++ b/data/pokemon/base_stats/flareon.asm @@ -8,7 +8,7 @@ db 198 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/forretress.asm b/data/pokemon/base_stats/forretress.asm similarity index 96% rename from data/base_stats/forretress.asm rename to data/pokemon/base_stats/forretress.asm index ab36e1827..08fec2745 100644 --- a/data/base_stats/forretress.asm +++ b/data/pokemon/base_stats/forretress.asm @@ -8,7 +8,7 @@ db 118 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/furret.asm b/data/pokemon/base_stats/furret.asm similarity index 96% rename from data/base_stats/furret.asm rename to data/pokemon/base_stats/furret.asm index 75180036c..3e3b7a656 100644 --- a/data/base_stats/furret.asm +++ b/data/pokemon/base_stats/furret.asm @@ -8,7 +8,7 @@ db 116 ; base exp db BERRY ; item 1 db GOLD_BERRY ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm similarity index 96% rename from data/base_stats/gastly.asm rename to data/pokemon/base_stats/gastly.asm index dcec2fdca..cda05fe05 100644 --- a/data/base_stats/gastly.asm +++ b/data/pokemon/base_stats/gastly.asm @@ -8,7 +8,7 @@ db 95 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm similarity index 96% rename from data/base_stats/gengar.asm rename to data/pokemon/base_stats/gengar.asm index 5fe8894ef..9b9cc3310 100644 --- a/data/base_stats/gengar.asm +++ b/data/pokemon/base_stats/gengar.asm @@ -8,7 +8,7 @@ db 190 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm similarity index 96% rename from data/base_stats/geodude.asm rename to data/pokemon/base_stats/geodude.asm index 2b472bafc..86b627107 100644 --- a/data/base_stats/geodude.asm +++ b/data/pokemon/base_stats/geodude.asm @@ -8,7 +8,7 @@ db 86 ; base exp db NO_ITEM ; item 1 db EVERSTONE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/girafarig.asm b/data/pokemon/base_stats/girafarig.asm similarity index 96% rename from data/base_stats/girafarig.asm rename to data/pokemon/base_stats/girafarig.asm index 3180513f7..7391367cf 100644 --- a/data/base_stats/girafarig.asm +++ b/data/pokemon/base_stats/girafarig.asm @@ -8,7 +8,7 @@ db 149 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/gligar.asm b/data/pokemon/base_stats/gligar.asm similarity index 96% rename from data/base_stats/gligar.asm rename to data/pokemon/base_stats/gligar.asm index 3197e0203..5bb7fdca8 100644 --- a/data/base_stats/gligar.asm +++ b/data/pokemon/base_stats/gligar.asm @@ -8,7 +8,7 @@ db 108 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm similarity index 96% rename from data/base_stats/gloom.asm rename to data/pokemon/base_stats/gloom.asm index d67f73d54..33cea01f2 100644 --- a/data/base_stats/gloom.asm +++ b/data/pokemon/base_stats/gloom.asm @@ -8,7 +8,7 @@ db 132 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm similarity index 96% rename from data/base_stats/golbat.asm rename to data/pokemon/base_stats/golbat.asm index be69af4cf..06769b880 100644 --- a/data/base_stats/golbat.asm +++ b/data/pokemon/base_stats/golbat.asm @@ -8,7 +8,7 @@ db 171 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm similarity index 96% rename from data/base_stats/goldeen.asm rename to data/pokemon/base_stats/goldeen.asm index 3769ce1b6..314852a3e 100644 --- a/data/base_stats/goldeen.asm +++ b/data/pokemon/base_stats/goldeen.asm @@ -8,7 +8,7 @@ db 111 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm similarity index 96% rename from data/base_stats/golduck.asm rename to data/pokemon/base_stats/golduck.asm index b32d538b5..9c4dbb5f5 100644 --- a/data/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -8,7 +8,7 @@ db 174 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm similarity index 96% rename from data/base_stats/golem.asm rename to data/pokemon/base_stats/golem.asm index b8fb85054..9a9f04451 100644 --- a/data/base_stats/golem.asm +++ b/data/pokemon/base_stats/golem.asm @@ -8,7 +8,7 @@ db 177 ; base exp db NO_ITEM ; item 1 db EVERSTONE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/granbull.asm b/data/pokemon/base_stats/granbull.asm similarity index 96% rename from data/base_stats/granbull.asm rename to data/pokemon/base_stats/granbull.asm index c2dcda517..088e17dd8 100644 --- a/data/base_stats/granbull.asm +++ b/data/pokemon/base_stats/granbull.asm @@ -8,7 +8,7 @@ db 178 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm similarity index 96% rename from data/base_stats/graveler.asm rename to data/pokemon/base_stats/graveler.asm index 17e4e8905..dfbeb770c 100644 --- a/data/base_stats/graveler.asm +++ b/data/pokemon/base_stats/graveler.asm @@ -8,7 +8,7 @@ db 134 ; base exp db NO_ITEM ; item 1 db EVERSTONE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm similarity index 96% rename from data/base_stats/grimer.asm rename to data/pokemon/base_stats/grimer.asm index 7fb64eb07..86dacd1e6 100644 --- a/data/base_stats/grimer.asm +++ b/data/pokemon/base_stats/grimer.asm @@ -8,7 +8,7 @@ db 90 ; base exp db NO_ITEM ; item 1 db NUGGET ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm similarity index 96% rename from data/base_stats/growlithe.asm rename to data/pokemon/base_stats/growlithe.asm index a5e8676f6..ef5cc53b3 100644 --- a/data/base_stats/growlithe.asm +++ b/data/pokemon/base_stats/growlithe.asm @@ -8,7 +8,7 @@ db 91 ; base exp db BURNT_BERRY ; item 1 db BURNT_BERRY ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm similarity index 96% rename from data/base_stats/gyarados.asm rename to data/pokemon/base_stats/gyarados.asm index 9b57391c5..1bdceff88 100644 --- a/data/base_stats/gyarados.asm +++ b/data/pokemon/base_stats/gyarados.asm @@ -8,7 +8,7 @@ db 214 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 5 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm similarity index 96% rename from data/base_stats/haunter.asm rename to data/pokemon/base_stats/haunter.asm index 76f18a739..0db7406c1 100644 --- a/data/base_stats/haunter.asm +++ b/data/pokemon/base_stats/haunter.asm @@ -8,7 +8,7 @@ db 126 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/heracross.asm b/data/pokemon/base_stats/heracross.asm similarity index 96% rename from data/base_stats/heracross.asm rename to data/pokemon/base_stats/heracross.asm index 5d625bf58..1f81d9c7b 100644 --- a/data/base_stats/heracross.asm +++ b/data/pokemon/base_stats/heracross.asm @@ -8,7 +8,7 @@ db 200 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm similarity index 96% rename from data/base_stats/hitmonchan.asm rename to data/pokemon/base_stats/hitmonchan.asm index dbad48c61..3eeb23dd4 100644 --- a/data/base_stats/hitmonchan.asm +++ b/data/pokemon/base_stats/hitmonchan.asm @@ -8,7 +8,7 @@ db 140 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 0 ; gender + db GENDER_F0 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm similarity index 96% rename from data/base_stats/hitmonlee.asm rename to data/pokemon/base_stats/hitmonlee.asm index 2a7c5a553..a31352209 100644 --- a/data/base_stats/hitmonlee.asm +++ b/data/pokemon/base_stats/hitmonlee.asm @@ -8,7 +8,7 @@ db 139 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 0 ; gender + db GENDER_F0 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm similarity index 96% rename from data/base_stats/hitmontop.asm rename to data/pokemon/base_stats/hitmontop.asm index b4e33a3ee..532b8a6d8 100644 --- a/data/base_stats/hitmontop.asm +++ b/data/pokemon/base_stats/hitmontop.asm @@ -8,7 +8,7 @@ db 138 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 0 ; gender + db GENDER_F0 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ho_oh.asm b/data/pokemon/base_stats/ho_oh.asm similarity index 97% rename from data/base_stats/ho_oh.asm rename to data/pokemon/base_stats/ho_oh.asm index 5e58d46ae..311bbf6cf 100644 --- a/data/base_stats/ho_oh.asm +++ b/data/pokemon/base_stats/ho_oh.asm @@ -8,7 +8,7 @@ db 220 ; base exp db SACRED_ASH ; item 1 db SACRED_ASH ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 120 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/hoothoot.asm b/data/pokemon/base_stats/hoothoot.asm similarity index 96% rename from data/base_stats/hoothoot.asm rename to data/pokemon/base_stats/hoothoot.asm index 1af3a01db..0442fe414 100644 --- a/data/base_stats/hoothoot.asm +++ b/data/pokemon/base_stats/hoothoot.asm @@ -8,7 +8,7 @@ db 58 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/hoppip.asm b/data/pokemon/base_stats/hoppip.asm similarity index 96% rename from data/base_stats/hoppip.asm rename to data/pokemon/base_stats/hoppip.asm index ad2bb7a02..b1918d699 100644 --- a/data/base_stats/hoppip.asm +++ b/data/pokemon/base_stats/hoppip.asm @@ -8,7 +8,7 @@ db 74 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm similarity index 96% rename from data/base_stats/horsea.asm rename to data/pokemon/base_stats/horsea.asm index 5a4e06b84..3296f52af 100644 --- a/data/base_stats/horsea.asm +++ b/data/pokemon/base_stats/horsea.asm @@ -8,7 +8,7 @@ db 83 ; base exp db NO_ITEM ; item 1 db DRAGON_SCALE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/houndoom.asm b/data/pokemon/base_stats/houndoom.asm similarity index 96% rename from data/base_stats/houndoom.asm rename to data/pokemon/base_stats/houndoom.asm index 82271238c..234832675 100644 --- a/data/base_stats/houndoom.asm +++ b/data/pokemon/base_stats/houndoom.asm @@ -8,7 +8,7 @@ db 204 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/houndour.asm b/data/pokemon/base_stats/houndour.asm similarity index 96% rename from data/base_stats/houndour.asm rename to data/pokemon/base_stats/houndour.asm index 6f97bd086..f743cd81e 100644 --- a/data/base_stats/houndour.asm +++ b/data/pokemon/base_stats/houndour.asm @@ -8,7 +8,7 @@ db 114 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm similarity index 96% rename from data/base_stats/hypno.asm rename to data/pokemon/base_stats/hypno.asm index 1bf322d95..6c132b6bf 100644 --- a/data/base_stats/hypno.asm +++ b/data/pokemon/base_stats/hypno.asm @@ -8,7 +8,7 @@ db 165 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/igglybuff.asm b/data/pokemon/base_stats/igglybuff.asm similarity index 96% rename from data/base_stats/igglybuff.asm rename to data/pokemon/base_stats/igglybuff.asm index 1951f5aa0..fbf32ecca 100644 --- a/data/base_stats/igglybuff.asm +++ b/data/pokemon/base_stats/igglybuff.asm @@ -8,7 +8,7 @@ db 39 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm similarity index 96% rename from data/base_stats/ivysaur.asm rename to data/pokemon/base_stats/ivysaur.asm index 032c2408c..7d98b4b6d 100644 --- a/data/base_stats/ivysaur.asm +++ b/data/pokemon/base_stats/ivysaur.asm @@ -8,7 +8,7 @@ db 141 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm similarity index 97% rename from data/base_stats/jigglypuff.asm rename to data/pokemon/base_stats/jigglypuff.asm index 66ab23227..0f4ea788e 100644 --- a/data/base_stats/jigglypuff.asm +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -8,7 +8,7 @@ db 76 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm similarity index 96% rename from data/base_stats/jolteon.asm rename to data/pokemon/base_stats/jolteon.asm index 3f956946a..665a40d1d 100644 --- a/data/base_stats/jolteon.asm +++ b/data/pokemon/base_stats/jolteon.asm @@ -8,7 +8,7 @@ db 197 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/jumpluff.asm b/data/pokemon/base_stats/jumpluff.asm similarity index 96% rename from data/base_stats/jumpluff.asm rename to data/pokemon/base_stats/jumpluff.asm index 7a857dec4..623fbe82d 100644 --- a/data/base_stats/jumpluff.asm +++ b/data/pokemon/base_stats/jumpluff.asm @@ -8,7 +8,7 @@ db 176 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm similarity index 96% rename from data/base_stats/jynx.asm rename to data/pokemon/base_stats/jynx.asm index 054dca9ae..c47a4315d 100644 --- a/data/base_stats/jynx.asm +++ b/data/pokemon/base_stats/jynx.asm @@ -8,7 +8,7 @@ db 137 ; base exp db ICE_BERRY ; item 1 db ICE_BERRY ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm similarity index 95% rename from data/base_stats/kabuto.asm rename to data/pokemon/base_stats/kabuto.asm index 024f2791d..9a38cbcba 100644 --- a/data/base_stats/kabuto.asm +++ b/data/pokemon/base_stats/kabuto.asm @@ -8,7 +8,7 @@ db 119 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 30 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm similarity index 96% rename from data/base_stats/kabutops.asm rename to data/pokemon/base_stats/kabutops.asm index 3c5076954..b8de99fa1 100644 --- a/data/base_stats/kabutops.asm +++ b/data/pokemon/base_stats/kabutops.asm @@ -8,7 +8,7 @@ db 201 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 30 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm similarity index 96% rename from data/base_stats/kadabra.asm rename to data/pokemon/base_stats/kadabra.asm index bf5f33638..6a4e56f13 100644 --- a/data/base_stats/kadabra.asm +++ b/data/pokemon/base_stats/kadabra.asm @@ -8,7 +8,7 @@ db 145 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm similarity index 94% rename from data/base_stats/kakuna.asm rename to data/pokemon/base_stats/kakuna.asm index 827e17262..83241fbcd 100644 --- a/data/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.asm @@ -8,7 +8,7 @@ db 71 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm similarity index 97% rename from data/base_stats/kangaskhan.asm rename to data/pokemon/base_stats/kangaskhan.asm index ca6094ad7..21af227f0 100644 --- a/data/base_stats/kangaskhan.asm +++ b/data/pokemon/base_stats/kangaskhan.asm @@ -8,7 +8,7 @@ db 175 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm similarity index 96% rename from data/base_stats/kingdra.asm rename to data/pokemon/base_stats/kingdra.asm index ac4dfd659..e62d0f23e 100644 --- a/data/base_stats/kingdra.asm +++ b/data/pokemon/base_stats/kingdra.asm @@ -8,7 +8,7 @@ db 207 ; base exp db NO_ITEM ; item 1 db DRAGON_SCALE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm similarity index 96% rename from data/base_stats/kingler.asm rename to data/pokemon/base_stats/kingler.asm index 65c3344ac..01ac23a99 100644 --- a/data/base_stats/kingler.asm +++ b/data/pokemon/base_stats/kingler.asm @@ -8,7 +8,7 @@ db 206 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm similarity index 96% rename from data/base_stats/koffing.asm rename to data/pokemon/base_stats/koffing.asm index b46e8241e..70e8bd114 100644 --- a/data/base_stats/koffing.asm +++ b/data/pokemon/base_stats/koffing.asm @@ -8,7 +8,7 @@ db 114 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm similarity index 96% rename from data/base_stats/krabby.asm rename to data/pokemon/base_stats/krabby.asm index 517d3bd07..60ce4c7f4 100644 --- a/data/base_stats/krabby.asm +++ b/data/pokemon/base_stats/krabby.asm @@ -8,7 +8,7 @@ db 115 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/lanturn.asm b/data/pokemon/base_stats/lanturn.asm similarity index 96% rename from data/base_stats/lanturn.asm rename to data/pokemon/base_stats/lanturn.asm index f4dd4cd3a..f5b747fad 100644 --- a/data/base_stats/lanturn.asm +++ b/data/pokemon/base_stats/lanturn.asm @@ -8,7 +8,7 @@ db 156 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm similarity index 96% rename from data/base_stats/lapras.asm rename to data/pokemon/base_stats/lapras.asm index e57154bc6..9477b6791 100644 --- a/data/base_stats/lapras.asm +++ b/data/pokemon/base_stats/lapras.asm @@ -8,7 +8,7 @@ db 219 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/larvitar.asm b/data/pokemon/base_stats/larvitar.asm similarity index 96% rename from data/base_stats/larvitar.asm rename to data/pokemon/base_stats/larvitar.asm index 03a9be50f..7de66ca7f 100644 --- a/data/base_stats/larvitar.asm +++ b/data/pokemon/base_stats/larvitar.asm @@ -8,7 +8,7 @@ db 67 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ledian.asm b/data/pokemon/base_stats/ledian.asm similarity index 96% rename from data/base_stats/ledian.asm rename to data/pokemon/base_stats/ledian.asm index a1ca61629..84a06c092 100644 --- a/data/base_stats/ledian.asm +++ b/data/pokemon/base_stats/ledian.asm @@ -8,7 +8,7 @@ db 134 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ledyba.asm b/data/pokemon/base_stats/ledyba.asm similarity index 96% rename from data/base_stats/ledyba.asm rename to data/pokemon/base_stats/ledyba.asm index a01e329b1..68a20d1ea 100644 --- a/data/base_stats/ledyba.asm +++ b/data/pokemon/base_stats/ledyba.asm @@ -8,7 +8,7 @@ db 54 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm similarity index 97% rename from data/base_stats/lickitung.asm rename to data/pokemon/base_stats/lickitung.asm index 8b915bc59..0f8f351da 100644 --- a/data/base_stats/lickitung.asm +++ b/data/pokemon/base_stats/lickitung.asm @@ -8,7 +8,7 @@ db 127 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm similarity index 97% rename from data/base_stats/lugia.asm rename to data/pokemon/base_stats/lugia.asm index 26f337e2a..3a4109ab9 100644 --- a/data/base_stats/lugia.asm +++ b/data/pokemon/base_stats/lugia.asm @@ -8,7 +8,7 @@ db 220 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 120 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm similarity index 96% rename from data/base_stats/machamp.asm rename to data/pokemon/base_stats/machamp.asm index 056ce3945..bb716cf25 100644 --- a/data/base_stats/machamp.asm +++ b/data/pokemon/base_stats/machamp.asm @@ -8,7 +8,7 @@ db 193 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm similarity index 96% rename from data/base_stats/machoke.asm rename to data/pokemon/base_stats/machoke.asm index 3fdec0eb2..79caf8c70 100644 --- a/data/base_stats/machoke.asm +++ b/data/pokemon/base_stats/machoke.asm @@ -8,7 +8,7 @@ db 146 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm similarity index 96% rename from data/base_stats/machop.asm rename to data/pokemon/base_stats/machop.asm index bdde42528..6b0cbaab7 100644 --- a/data/base_stats/machop.asm +++ b/data/pokemon/base_stats/machop.asm @@ -8,7 +8,7 @@ db 88 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/magby.asm b/data/pokemon/base_stats/magby.asm similarity index 96% rename from data/base_stats/magby.asm rename to data/pokemon/base_stats/magby.asm index 876bceb3f..478dfb8b8 100644 --- a/data/base_stats/magby.asm +++ b/data/pokemon/base_stats/magby.asm @@ -8,7 +8,7 @@ db 117 ; base exp db BURNT_BERRY ; item 1 db BURNT_BERRY ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/magcargo.asm b/data/pokemon/base_stats/magcargo.asm similarity index 96% rename from data/base_stats/magcargo.asm rename to data/pokemon/base_stats/magcargo.asm index bdbd0ca97..45493135b 100644 --- a/data/base_stats/magcargo.asm +++ b/data/pokemon/base_stats/magcargo.asm @@ -8,7 +8,7 @@ db 154 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm similarity index 94% rename from data/base_stats/magikarp.asm rename to data/pokemon/base_stats/magikarp.asm index 5d489fbff..2519b475b 100644 --- a/data/base_stats/magikarp.asm +++ b/data/pokemon/base_stats/magikarp.asm @@ -8,7 +8,7 @@ db 20 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 5 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm similarity index 96% rename from data/base_stats/magmar.asm rename to data/pokemon/base_stats/magmar.asm index 3c27ad670..ea14c66cd 100644 --- a/data/base_stats/magmar.asm +++ b/data/pokemon/base_stats/magmar.asm @@ -8,7 +8,7 @@ db 167 ; base exp db BURNT_BERRY ; item 1 db BURNT_BERRY ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm similarity index 96% rename from data/base_stats/magnemite.asm rename to data/pokemon/base_stats/magnemite.asm index 78a3ddea6..19a85a9a1 100644 --- a/data/base_stats/magnemite.asm +++ b/data/pokemon/base_stats/magnemite.asm @@ -8,7 +8,7 @@ db 89 ; base exp db NO_ITEM ; item 1 db METAL_COAT ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm similarity index 96% rename from data/base_stats/magneton.asm rename to data/pokemon/base_stats/magneton.asm index 8b9158bba..5fdbe68f4 100644 --- a/data/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -8,7 +8,7 @@ db 161 ; base exp db NO_ITEM ; item 1 db METAL_COAT ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm similarity index 96% rename from data/base_stats/mankey.asm rename to data/pokemon/base_stats/mankey.asm index 7ee15d3f7..77cc260d4 100644 --- a/data/base_stats/mankey.asm +++ b/data/pokemon/base_stats/mankey.asm @@ -8,7 +8,7 @@ db 74 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/mantine.asm b/data/pokemon/base_stats/mantine.asm similarity index 96% rename from data/base_stats/mantine.asm rename to data/pokemon/base_stats/mantine.asm index e8730d787..bfe113428 100644 --- a/data/base_stats/mantine.asm +++ b/data/pokemon/base_stats/mantine.asm @@ -8,7 +8,7 @@ db 168 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/mareep.asm b/data/pokemon/base_stats/mareep.asm similarity index 96% rename from data/base_stats/mareep.asm rename to data/pokemon/base_stats/mareep.asm index 366863245..cc190b664 100644 --- a/data/base_stats/mareep.asm +++ b/data/pokemon/base_stats/mareep.asm @@ -8,7 +8,7 @@ db 59 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm similarity index 96% rename from data/base_stats/marill.asm rename to data/pokemon/base_stats/marill.asm index 7d9f4ce8a..73708d1df 100644 --- a/data/base_stats/marill.asm +++ b/data/pokemon/base_stats/marill.asm @@ -8,7 +8,7 @@ db 58 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm similarity index 96% rename from data/base_stats/marowak.asm rename to data/pokemon/base_stats/marowak.asm index 76b7e4870..3e04b9697 100644 --- a/data/base_stats/marowak.asm +++ b/data/pokemon/base_stats/marowak.asm @@ -8,7 +8,7 @@ db 124 ; base exp db NO_ITEM ; item 1 db THICK_CLUB ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/meganium.asm b/data/pokemon/base_stats/meganium.asm similarity index 96% rename from data/base_stats/meganium.asm rename to data/pokemon/base_stats/meganium.asm index 57f228c28..cf1125003 100644 --- a/data/base_stats/meganium.asm +++ b/data/pokemon/base_stats/meganium.asm @@ -8,7 +8,7 @@ db 208 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm similarity index 96% rename from data/base_stats/meowth.asm rename to data/pokemon/base_stats/meowth.asm index f795aa4c2..f177f0efd 100644 --- a/data/base_stats/meowth.asm +++ b/data/pokemon/base_stats/meowth.asm @@ -8,7 +8,7 @@ db 69 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm similarity index 94% rename from data/base_stats/metapod.asm rename to data/pokemon/base_stats/metapod.asm index deb7bc8e7..e26e31fc5 100644 --- a/data/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.asm @@ -8,7 +8,7 @@ db 72 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm similarity index 97% rename from data/base_stats/mew.asm rename to data/pokemon/base_stats/mew.asm index 7544467c7..e2bac0040 100644 --- a/data/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.asm @@ -8,7 +8,7 @@ db 64 ; base exp db NO_ITEM ; item 1 db MIRACLEBERRY ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 120 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm similarity index 97% rename from data/base_stats/mewtwo.asm rename to data/pokemon/base_stats/mewtwo.asm index 61e01c32c..28da9f404 100644 --- a/data/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.asm @@ -8,7 +8,7 @@ db 220 ; base exp db NO_ITEM ; item 1 db BERSERK_GENE ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 120 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.asm similarity index 97% rename from data/base_stats/miltank.asm rename to data/pokemon/base_stats/miltank.asm index 7083c15c7..63ed422bc 100644 --- a/data/base_stats/miltank.asm +++ b/data/pokemon/base_stats/miltank.asm @@ -8,7 +8,7 @@ db 200 ; base exp db MOOMOO_MILK ; item 1 db MOOMOO_MILK ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/misdreavus.asm b/data/pokemon/base_stats/misdreavus.asm similarity index 96% rename from data/base_stats/misdreavus.asm rename to data/pokemon/base_stats/misdreavus.asm index 5811aa665..dc730ad9a 100644 --- a/data/base_stats/misdreavus.asm +++ b/data/pokemon/base_stats/misdreavus.asm @@ -8,7 +8,7 @@ db 147 ; base exp db NO_ITEM ; item 1 db SPELL_TAG ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm similarity index 96% rename from data/base_stats/moltres.asm rename to data/pokemon/base_stats/moltres.asm index 13eb7e7af..bf70c2821 100644 --- a/data/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -8,7 +8,7 @@ db 217 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm similarity index 96% rename from data/base_stats/mr__mime.asm rename to data/pokemon/base_stats/mr__mime.asm index 3a271baf4..d7042d55a 100644 --- a/data/base_stats/mr__mime.asm +++ b/data/pokemon/base_stats/mr__mime.asm @@ -8,7 +8,7 @@ db 136 ; base exp db NO_ITEM ; item 1 db MYSTERYBERRY ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm similarity index 96% rename from data/base_stats/muk.asm rename to data/pokemon/base_stats/muk.asm index 7669e59b0..30c6414fd 100644 --- a/data/base_stats/muk.asm +++ b/data/pokemon/base_stats/muk.asm @@ -8,7 +8,7 @@ db 157 ; base exp db NO_ITEM ; item 1 db NUGGET ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/murkrow.asm b/data/pokemon/base_stats/murkrow.asm similarity index 96% rename from data/base_stats/murkrow.asm rename to data/pokemon/base_stats/murkrow.asm index 08a1d7143..7f459e8aa 100644 --- a/data/base_stats/murkrow.asm +++ b/data/pokemon/base_stats/murkrow.asm @@ -8,7 +8,7 @@ db 107 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/natu.asm b/data/pokemon/base_stats/natu.asm similarity index 96% rename from data/base_stats/natu.asm rename to data/pokemon/base_stats/natu.asm index 2f65b73ba..9d00ce7eb 100644 --- a/data/base_stats/natu.asm +++ b/data/pokemon/base_stats/natu.asm @@ -8,7 +8,7 @@ db 73 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm similarity index 97% rename from data/base_stats/nidoking.asm rename to data/pokemon/base_stats/nidoking.asm index a5d6abef0..316f71e87 100644 --- a/data/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -8,7 +8,7 @@ db 195 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 0 ; gender + db GENDER_F0 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm similarity index 97% rename from data/base_stats/nidoqueen.asm rename to data/pokemon/base_stats/nidoqueen.asm index cf888b7eb..e9d2ae611 100644 --- a/data/base_stats/nidoqueen.asm +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -8,7 +8,7 @@ db 194 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.asm similarity index 96% rename from data/base_stats/nidoran_f.asm rename to data/pokemon/base_stats/nidoran_f.asm index e80b622c9..1cd53b17a 100644 --- a/data/base_stats/nidoran_f.asm +++ b/data/pokemon/base_stats/nidoran_f.asm @@ -8,7 +8,7 @@ db 59 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.asm similarity index 96% rename from data/base_stats/nidoran_m.asm rename to data/pokemon/base_stats/nidoran_m.asm index 1029a2511..cf0c1e1b2 100644 --- a/data/base_stats/nidoran_m.asm +++ b/data/pokemon/base_stats/nidoran_m.asm @@ -8,7 +8,7 @@ db 60 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 0 ; gender + db GENDER_F0 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm similarity index 96% rename from data/base_stats/nidorina.asm rename to data/pokemon/base_stats/nidorina.asm index 3ca843e85..42b3aebf8 100644 --- a/data/base_stats/nidorina.asm +++ b/data/pokemon/base_stats/nidorina.asm @@ -8,7 +8,7 @@ db 117 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm similarity index 96% rename from data/base_stats/nidorino.asm rename to data/pokemon/base_stats/nidorino.asm index c853ef943..f31e8df3d 100644 --- a/data/base_stats/nidorino.asm +++ b/data/pokemon/base_stats/nidorino.asm @@ -8,7 +8,7 @@ db 118 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 0 ; gender + db GENDER_F0 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm similarity index 96% rename from data/base_stats/ninetales.asm rename to data/pokemon/base_stats/ninetales.asm index c651f8c57..5fd84b886 100644 --- a/data/base_stats/ninetales.asm +++ b/data/pokemon/base_stats/ninetales.asm @@ -8,7 +8,7 @@ db 178 ; base exp db BURNT_BERRY ; item 1 db BURNT_BERRY ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/noctowl.asm b/data/pokemon/base_stats/noctowl.asm similarity index 96% rename from data/base_stats/noctowl.asm rename to data/pokemon/base_stats/noctowl.asm index 7c97fd769..e2c8565bd 100644 --- a/data/base_stats/noctowl.asm +++ b/data/pokemon/base_stats/noctowl.asm @@ -8,7 +8,7 @@ db 162 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/octillery.asm b/data/pokemon/base_stats/octillery.asm similarity index 96% rename from data/base_stats/octillery.asm rename to data/pokemon/base_stats/octillery.asm index 1d64afa82..80b5ad97a 100644 --- a/data/base_stats/octillery.asm +++ b/data/pokemon/base_stats/octillery.asm @@ -8,7 +8,7 @@ db 164 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm similarity index 96% rename from data/base_stats/oddish.asm rename to data/pokemon/base_stats/oddish.asm index dc91485b6..df75f6485 100644 --- a/data/base_stats/oddish.asm +++ b/data/pokemon/base_stats/oddish.asm @@ -8,7 +8,7 @@ db 78 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm similarity index 96% rename from data/base_stats/omanyte.asm rename to data/pokemon/base_stats/omanyte.asm index 0e511f244..6278f4e3c 100644 --- a/data/base_stats/omanyte.asm +++ b/data/pokemon/base_stats/omanyte.asm @@ -8,7 +8,7 @@ db 120 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 30 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm similarity index 96% rename from data/base_stats/omastar.asm rename to data/pokemon/base_stats/omastar.asm index 7e35a8987..d3f3b15e1 100644 --- a/data/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -8,7 +8,7 @@ db 199 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 30 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm similarity index 96% rename from data/base_stats/onix.asm rename to data/pokemon/base_stats/onix.asm index f67c1eb86..2fc5bd175 100644 --- a/data/base_stats/onix.asm +++ b/data/pokemon/base_stats/onix.asm @@ -8,7 +8,7 @@ db 108 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm similarity index 96% rename from data/base_stats/paras.asm rename to data/pokemon/base_stats/paras.asm index 4994aa8dd..d86a51765 100644 --- a/data/base_stats/paras.asm +++ b/data/pokemon/base_stats/paras.asm @@ -8,7 +8,7 @@ db 70 ; base exp db TINYMUSHROOM ; item 1 db BIG_MUSHROOM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm similarity index 96% rename from data/base_stats/parasect.asm rename to data/pokemon/base_stats/parasect.asm index 310eba07f..5c4320fd3 100644 --- a/data/base_stats/parasect.asm +++ b/data/pokemon/base_stats/parasect.asm @@ -8,7 +8,7 @@ db 128 ; base exp db TINYMUSHROOM ; item 1 db BIG_MUSHROOM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm similarity index 96% rename from data/base_stats/persian.asm rename to data/pokemon/base_stats/persian.asm index f76ecaaae..fd2677e16 100644 --- a/data/base_stats/persian.asm +++ b/data/pokemon/base_stats/persian.asm @@ -8,7 +8,7 @@ db 148 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/phanpy.asm b/data/pokemon/base_stats/phanpy.asm similarity index 96% rename from data/base_stats/phanpy.asm rename to data/pokemon/base_stats/phanpy.asm index 08ff39595..93a26d43c 100644 --- a/data/base_stats/phanpy.asm +++ b/data/pokemon/base_stats/phanpy.asm @@ -8,7 +8,7 @@ db 124 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.asm similarity index 96% rename from data/base_stats/pichu.asm rename to data/pokemon/base_stats/pichu.asm index dbadc22d3..da497bdf8 100644 --- a/data/base_stats/pichu.asm +++ b/data/pokemon/base_stats/pichu.asm @@ -8,7 +8,7 @@ db 42 ; base exp db NO_ITEM ; item 1 db BERRY ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm similarity index 96% rename from data/base_stats/pidgeot.asm rename to data/pokemon/base_stats/pidgeot.asm index 1024b6624..35222d2be 100644 --- a/data/base_stats/pidgeot.asm +++ b/data/pokemon/base_stats/pidgeot.asm @@ -8,7 +8,7 @@ db 172 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm similarity index 96% rename from data/base_stats/pidgeotto.asm rename to data/pokemon/base_stats/pidgeotto.asm index 8e9d434a3..13b2d8e0c 100644 --- a/data/base_stats/pidgeotto.asm +++ b/data/pokemon/base_stats/pidgeotto.asm @@ -8,7 +8,7 @@ db 113 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm similarity index 96% rename from data/base_stats/pidgey.asm rename to data/pokemon/base_stats/pidgey.asm index d5f8fa630..0290f1717 100644 --- a/data/base_stats/pidgey.asm +++ b/data/pokemon/base_stats/pidgey.asm @@ -8,7 +8,7 @@ db 55 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm similarity index 96% rename from data/base_stats/pikachu.asm rename to data/pokemon/base_stats/pikachu.asm index 5875b1ea7..cd998aead 100644 --- a/data/base_stats/pikachu.asm +++ b/data/pokemon/base_stats/pikachu.asm @@ -8,7 +8,7 @@ db 82 ; base exp db NO_ITEM ; item 1 db BERRY ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/piloswine.asm b/data/pokemon/base_stats/piloswine.asm similarity index 96% rename from data/base_stats/piloswine.asm rename to data/pokemon/base_stats/piloswine.asm index 3da32746b..dd8bf950b 100644 --- a/data/base_stats/piloswine.asm +++ b/data/pokemon/base_stats/piloswine.asm @@ -8,7 +8,7 @@ db 160 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/pineco.asm b/data/pokemon/base_stats/pineco.asm similarity index 96% rename from data/base_stats/pineco.asm rename to data/pokemon/base_stats/pineco.asm index 43289701c..2c27a9913 100644 --- a/data/base_stats/pineco.asm +++ b/data/pokemon/base_stats/pineco.asm @@ -8,7 +8,7 @@ db 60 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm similarity index 96% rename from data/base_stats/pinsir.asm rename to data/pokemon/base_stats/pinsir.asm index cd07cde27..697bba44c 100644 --- a/data/base_stats/pinsir.asm +++ b/data/pokemon/base_stats/pinsir.asm @@ -8,7 +8,7 @@ db 200 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm similarity index 96% rename from data/base_stats/politoed.asm rename to data/pokemon/base_stats/politoed.asm index 8b510fc8f..dd11f5080 100644 --- a/data/base_stats/politoed.asm +++ b/data/pokemon/base_stats/politoed.asm @@ -8,7 +8,7 @@ db 185 ; base exp db NO_ITEM ; item 1 db KINGS_ROCK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm similarity index 96% rename from data/base_stats/poliwag.asm rename to data/pokemon/base_stats/poliwag.asm index abcab97e2..fb362450c 100644 --- a/data/base_stats/poliwag.asm +++ b/data/pokemon/base_stats/poliwag.asm @@ -8,7 +8,7 @@ db 77 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm similarity index 96% rename from data/base_stats/poliwhirl.asm rename to data/pokemon/base_stats/poliwhirl.asm index c2aac43f7..d0d461164 100644 --- a/data/base_stats/poliwhirl.asm +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -8,7 +8,7 @@ db 131 ; base exp db NO_ITEM ; item 1 db KINGS_ROCK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm similarity index 96% rename from data/base_stats/poliwrath.asm rename to data/pokemon/base_stats/poliwrath.asm index 1e3130078..5745daee7 100644 --- a/data/base_stats/poliwrath.asm +++ b/data/pokemon/base_stats/poliwrath.asm @@ -8,7 +8,7 @@ db 185 ; base exp db NO_ITEM ; item 1 db KINGS_ROCK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm similarity index 96% rename from data/base_stats/ponyta.asm rename to data/pokemon/base_stats/ponyta.asm index 2366b1b12..5c1f77c98 100644 --- a/data/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.asm @@ -8,7 +8,7 @@ db 152 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm similarity index 96% rename from data/base_stats/porygon.asm rename to data/pokemon/base_stats/porygon.asm index 340c79af1..b0c99914b 100644 --- a/data/base_stats/porygon.asm +++ b/data/pokemon/base_stats/porygon.asm @@ -8,7 +8,7 @@ db 130 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm similarity index 96% rename from data/base_stats/porygon2.asm rename to data/pokemon/base_stats/porygon2.asm index 6c5a518a7..9e049a156 100644 --- a/data/base_stats/porygon2.asm +++ b/data/pokemon/base_stats/porygon2.asm @@ -8,7 +8,7 @@ db 180 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm similarity index 96% rename from data/base_stats/primeape.asm rename to data/pokemon/base_stats/primeape.asm index 4abd0b68f..249f9bee4 100644 --- a/data/base_stats/primeape.asm +++ b/data/pokemon/base_stats/primeape.asm @@ -8,7 +8,7 @@ db 149 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm similarity index 96% rename from data/base_stats/psyduck.asm rename to data/pokemon/base_stats/psyduck.asm index bbd0e64e3..261fdde99 100644 --- a/data/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.asm @@ -8,7 +8,7 @@ db 80 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/pupitar.asm b/data/pokemon/base_stats/pupitar.asm similarity index 96% rename from data/base_stats/pupitar.asm rename to data/pokemon/base_stats/pupitar.asm index 643b88e34..63c0a41a7 100644 --- a/data/base_stats/pupitar.asm +++ b/data/pokemon/base_stats/pupitar.asm @@ -8,7 +8,7 @@ db 144 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/quagsire.asm b/data/pokemon/base_stats/quagsire.asm similarity index 96% rename from data/base_stats/quagsire.asm rename to data/pokemon/base_stats/quagsire.asm index 3e65ce4a1..0f49866e7 100644 --- a/data/base_stats/quagsire.asm +++ b/data/pokemon/base_stats/quagsire.asm @@ -8,7 +8,7 @@ db 137 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/quilava.asm b/data/pokemon/base_stats/quilava.asm similarity index 96% rename from data/base_stats/quilava.asm rename to data/pokemon/base_stats/quilava.asm index f1d9a8b3c..efadeda06 100644 --- a/data/base_stats/quilava.asm +++ b/data/pokemon/base_stats/quilava.asm @@ -8,7 +8,7 @@ db 142 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm similarity index 96% rename from data/base_stats/qwilfish.asm rename to data/pokemon/base_stats/qwilfish.asm index 5308e60ef..70648e5fd 100644 --- a/data/base_stats/qwilfish.asm +++ b/data/pokemon/base_stats/qwilfish.asm @@ -8,7 +8,7 @@ db 100 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm similarity index 96% rename from data/base_stats/raichu.asm rename to data/pokemon/base_stats/raichu.asm index aefc56713..cdc5193cd 100644 --- a/data/base_stats/raichu.asm +++ b/data/pokemon/base_stats/raichu.asm @@ -8,7 +8,7 @@ db 122 ; base exp db NO_ITEM ; item 1 db BERRY ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm similarity index 96% rename from data/base_stats/raikou.asm rename to data/pokemon/base_stats/raikou.asm index 26966258d..a68f16181 100644 --- a/data/base_stats/raikou.asm +++ b/data/pokemon/base_stats/raikou.asm @@ -8,7 +8,7 @@ db 216 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm similarity index 96% rename from data/base_stats/rapidash.asm rename to data/pokemon/base_stats/rapidash.asm index a55f7cd36..0167e7439 100644 --- a/data/base_stats/rapidash.asm +++ b/data/pokemon/base_stats/rapidash.asm @@ -8,7 +8,7 @@ db 192 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm similarity index 96% rename from data/base_stats/raticate.asm rename to data/pokemon/base_stats/raticate.asm index 6248cf4ca..1cfc65906 100644 --- a/data/base_stats/raticate.asm +++ b/data/pokemon/base_stats/raticate.asm @@ -8,7 +8,7 @@ db 116 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm similarity index 96% rename from data/base_stats/rattata.asm rename to data/pokemon/base_stats/rattata.asm index 0fb688d58..13c21e889 100644 --- a/data/base_stats/rattata.asm +++ b/data/pokemon/base_stats/rattata.asm @@ -8,7 +8,7 @@ db 57 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/remoraid.asm b/data/pokemon/base_stats/remoraid.asm similarity index 96% rename from data/base_stats/remoraid.asm rename to data/pokemon/base_stats/remoraid.asm index 4af024564..10ae15479 100644 --- a/data/base_stats/remoraid.asm +++ b/data/pokemon/base_stats/remoraid.asm @@ -8,7 +8,7 @@ db 78 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm similarity index 97% rename from data/base_stats/rhydon.asm rename to data/pokemon/base_stats/rhydon.asm index 8890718a5..cdcfb4cad 100644 --- a/data/base_stats/rhydon.asm +++ b/data/pokemon/base_stats/rhydon.asm @@ -8,7 +8,7 @@ db 204 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm similarity index 96% rename from data/base_stats/rhyhorn.asm rename to data/pokemon/base_stats/rhyhorn.asm index 33cff8b54..67d438751 100644 --- a/data/base_stats/rhyhorn.asm +++ b/data/pokemon/base_stats/rhyhorn.asm @@ -8,7 +8,7 @@ db 135 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm similarity index 96% rename from data/base_stats/sandshrew.asm rename to data/pokemon/base_stats/sandshrew.asm index f2148f9fa..cc0a4c492 100644 --- a/data/base_stats/sandshrew.asm +++ b/data/pokemon/base_stats/sandshrew.asm @@ -8,7 +8,7 @@ db 93 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm similarity index 96% rename from data/base_stats/sandslash.asm rename to data/pokemon/base_stats/sandslash.asm index ae4c38df0..75f66b363 100644 --- a/data/base_stats/sandslash.asm +++ b/data/pokemon/base_stats/sandslash.asm @@ -8,7 +8,7 @@ db 163 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm similarity index 96% rename from data/base_stats/scizor.asm rename to data/pokemon/base_stats/scizor.asm index c05fa7aca..127110c7a 100644 --- a/data/base_stats/scizor.asm +++ b/data/pokemon/base_stats/scizor.asm @@ -8,7 +8,7 @@ db 200 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm similarity index 96% rename from data/base_stats/scyther.asm rename to data/pokemon/base_stats/scyther.asm index e01386c6e..4c4779f0f 100644 --- a/data/base_stats/scyther.asm +++ b/data/pokemon/base_stats/scyther.asm @@ -8,7 +8,7 @@ db 187 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm similarity index 96% rename from data/base_stats/seadra.asm rename to data/pokemon/base_stats/seadra.asm index b242641c3..b4dc47c20 100644 --- a/data/base_stats/seadra.asm +++ b/data/pokemon/base_stats/seadra.asm @@ -8,7 +8,7 @@ db 155 ; base exp db NO_ITEM ; item 1 db DRAGON_SCALE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm similarity index 96% rename from data/base_stats/seaking.asm rename to data/pokemon/base_stats/seaking.asm index 381c61298..4d6d2f91e 100644 --- a/data/base_stats/seaking.asm +++ b/data/pokemon/base_stats/seaking.asm @@ -8,7 +8,7 @@ db 170 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm similarity index 96% rename from data/base_stats/seel.asm rename to data/pokemon/base_stats/seel.asm index 2589fc272..39b44fad8 100644 --- a/data/base_stats/seel.asm +++ b/data/pokemon/base_stats/seel.asm @@ -8,7 +8,7 @@ db 100 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/sentret.asm b/data/pokemon/base_stats/sentret.asm similarity index 96% rename from data/base_stats/sentret.asm rename to data/pokemon/base_stats/sentret.asm index 25c7b779c..12e120087 100644 --- a/data/base_stats/sentret.asm +++ b/data/pokemon/base_stats/sentret.asm @@ -8,7 +8,7 @@ db 57 ; base exp db NO_ITEM ; item 1 db BERRY ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm similarity index 96% rename from data/base_stats/shellder.asm rename to data/pokemon/base_stats/shellder.asm index 7d7f801d7..fb60ff262 100644 --- a/data/base_stats/shellder.asm +++ b/data/pokemon/base_stats/shellder.asm @@ -8,7 +8,7 @@ db 97 ; base exp db PEARL ; item 1 db BIG_PEARL ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/shuckle.asm b/data/pokemon/base_stats/shuckle.asm similarity index 96% rename from data/base_stats/shuckle.asm rename to data/pokemon/base_stats/shuckle.asm index 9f2cee33b..7cd31ad79 100644 --- a/data/base_stats/shuckle.asm +++ b/data/pokemon/base_stats/shuckle.asm @@ -8,7 +8,7 @@ db 80 ; base exp db BERRY ; item 1 db BERRY ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/skarmory.asm b/data/pokemon/base_stats/skarmory.asm similarity index 96% rename from data/base_stats/skarmory.asm rename to data/pokemon/base_stats/skarmory.asm index 106cee7f3..cf271b39f 100644 --- a/data/base_stats/skarmory.asm +++ b/data/pokemon/base_stats/skarmory.asm @@ -8,7 +8,7 @@ db 168 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/skiploom.asm b/data/pokemon/base_stats/skiploom.asm similarity index 96% rename from data/base_stats/skiploom.asm rename to data/pokemon/base_stats/skiploom.asm index 2920f19f0..46bbc8a8c 100644 --- a/data/base_stats/skiploom.asm +++ b/data/pokemon/base_stats/skiploom.asm @@ -8,7 +8,7 @@ db 136 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm similarity index 97% rename from data/base_stats/slowbro.asm rename to data/pokemon/base_stats/slowbro.asm index 7c6520d8a..12e172238 100644 --- a/data/base_stats/slowbro.asm +++ b/data/pokemon/base_stats/slowbro.asm @@ -8,7 +8,7 @@ db 164 ; base exp db NO_ITEM ; item 1 db KINGS_ROCK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/slowking.asm b/data/pokemon/base_stats/slowking.asm similarity index 97% rename from data/base_stats/slowking.asm rename to data/pokemon/base_stats/slowking.asm index 4974b23c5..7307ca826 100644 --- a/data/base_stats/slowking.asm +++ b/data/pokemon/base_stats/slowking.asm @@ -8,7 +8,7 @@ db 164 ; base exp db NO_ITEM ; item 1 db KINGS_ROCK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm similarity index 96% rename from data/base_stats/slowpoke.asm rename to data/pokemon/base_stats/slowpoke.asm index 4ad676ab0..36bf88af2 100644 --- a/data/base_stats/slowpoke.asm +++ b/data/pokemon/base_stats/slowpoke.asm @@ -8,7 +8,7 @@ db 99 ; base exp db NO_ITEM ; item 1 db KINGS_ROCK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/slugma.asm b/data/pokemon/base_stats/slugma.asm similarity index 96% rename from data/base_stats/slugma.asm rename to data/pokemon/base_stats/slugma.asm index 52da7221f..a760dd40e 100644 --- a/data/base_stats/slugma.asm +++ b/data/pokemon/base_stats/slugma.asm @@ -8,7 +8,7 @@ db 78 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/smeargle.asm b/data/pokemon/base_stats/smeargle.asm similarity index 94% rename from data/base_stats/smeargle.asm rename to data/pokemon/base_stats/smeargle.asm index e3011c8d2..d80443acf 100644 --- a/data/base_stats/smeargle.asm +++ b/data/pokemon/base_stats/smeargle.asm @@ -8,7 +8,7 @@ db 106 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/smoochum.asm b/data/pokemon/base_stats/smoochum.asm similarity index 96% rename from data/base_stats/smoochum.asm rename to data/pokemon/base_stats/smoochum.asm index 985a52a19..69d74d5e8 100644 --- a/data/base_stats/smoochum.asm +++ b/data/pokemon/base_stats/smoochum.asm @@ -8,7 +8,7 @@ db 87 ; base exp db ICE_BERRY ; item 1 db ICE_BERRY ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/sneasel.asm b/data/pokemon/base_stats/sneasel.asm similarity index 96% rename from data/base_stats/sneasel.asm rename to data/pokemon/base_stats/sneasel.asm index eb62897eb..3abea4b7a 100644 --- a/data/base_stats/sneasel.asm +++ b/data/pokemon/base_stats/sneasel.asm @@ -8,7 +8,7 @@ db 132 ; base exp db NO_ITEM ; item 1 db QUICK_CLAW ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm similarity index 96% rename from data/base_stats/snorlax.asm rename to data/pokemon/base_stats/snorlax.asm index e04cd1442..0efe599c5 100644 --- a/data/base_stats/snorlax.asm +++ b/data/pokemon/base_stats/snorlax.asm @@ -8,7 +8,7 @@ db 154 ; base exp db LEFTOVERS ; item 1 db LEFTOVERS ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/snubbull.asm b/data/pokemon/base_stats/snubbull.asm similarity index 96% rename from data/base_stats/snubbull.asm rename to data/pokemon/base_stats/snubbull.asm index 3ac629f26..00d94a3cb 100644 --- a/data/base_stats/snubbull.asm +++ b/data/pokemon/base_stats/snubbull.asm @@ -8,7 +8,7 @@ db 63 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm similarity index 96% rename from data/base_stats/spearow.asm rename to data/pokemon/base_stats/spearow.asm index 4321aa799..b94e3559c 100644 --- a/data/base_stats/spearow.asm +++ b/data/pokemon/base_stats/spearow.asm @@ -8,7 +8,7 @@ db 58 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/spinarak.asm b/data/pokemon/base_stats/spinarak.asm similarity index 96% rename from data/base_stats/spinarak.asm rename to data/pokemon/base_stats/spinarak.asm index 7f00a4677..d9ca7679f 100644 --- a/data/base_stats/spinarak.asm +++ b/data/pokemon/base_stats/spinarak.asm @@ -8,7 +8,7 @@ db 54 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm similarity index 96% rename from data/base_stats/squirtle.asm rename to data/pokemon/base_stats/squirtle.asm index 06484e52c..1d9faa25d 100644 --- a/data/base_stats/squirtle.asm +++ b/data/pokemon/base_stats/squirtle.asm @@ -8,7 +8,7 @@ db 66 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/stantler.asm b/data/pokemon/base_stats/stantler.asm similarity index 96% rename from data/base_stats/stantler.asm rename to data/pokemon/base_stats/stantler.asm index 911e1904f..1978739e7 100644 --- a/data/base_stats/stantler.asm +++ b/data/pokemon/base_stats/stantler.asm @@ -8,7 +8,7 @@ db 165 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm similarity index 96% rename from data/base_stats/starmie.asm rename to data/pokemon/base_stats/starmie.asm index dbc2122bb..aa60f18d2 100644 --- a/data/base_stats/starmie.asm +++ b/data/pokemon/base_stats/starmie.asm @@ -8,7 +8,7 @@ db 207 ; base exp db STARDUST ; item 1 db STAR_PIECE ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm similarity index 96% rename from data/base_stats/staryu.asm rename to data/pokemon/base_stats/staryu.asm index 6d0d90eb3..d0520c3cc 100644 --- a/data/base_stats/staryu.asm +++ b/data/pokemon/base_stats/staryu.asm @@ -8,7 +8,7 @@ db 106 ; base exp db STARDUST ; item 1 db STAR_PIECE ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm similarity index 96% rename from data/base_stats/steelix.asm rename to data/pokemon/base_stats/steelix.asm index f740d0c02..df5d8940c 100644 --- a/data/base_stats/steelix.asm +++ b/data/pokemon/base_stats/steelix.asm @@ -8,7 +8,7 @@ db 196 ; base exp db NO_ITEM ; item 1 db METAL_COAT ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/sudowoodo.asm b/data/pokemon/base_stats/sudowoodo.asm similarity index 96% rename from data/base_stats/sudowoodo.asm rename to data/pokemon/base_stats/sudowoodo.asm index 6ddc4cd57..1c6c33984 100644 --- a/data/base_stats/sudowoodo.asm +++ b/data/pokemon/base_stats/sudowoodo.asm @@ -8,7 +8,7 @@ db 135 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/suicune.asm b/data/pokemon/base_stats/suicune.asm similarity index 96% rename from data/base_stats/suicune.asm rename to data/pokemon/base_stats/suicune.asm index 6262bd513..04ece5516 100644 --- a/data/base_stats/suicune.asm +++ b/data/pokemon/base_stats/suicune.asm @@ -8,7 +8,7 @@ db 215 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/sunflora.asm b/data/pokemon/base_stats/sunflora.asm similarity index 96% rename from data/base_stats/sunflora.asm rename to data/pokemon/base_stats/sunflora.asm index d8f01ebad..97974939c 100644 --- a/data/base_stats/sunflora.asm +++ b/data/pokemon/base_stats/sunflora.asm @@ -8,7 +8,7 @@ db 146 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/sunkern.asm b/data/pokemon/base_stats/sunkern.asm similarity index 96% rename from data/base_stats/sunkern.asm rename to data/pokemon/base_stats/sunkern.asm index 2cab9d9a1..054625425 100644 --- a/data/base_stats/sunkern.asm +++ b/data/pokemon/base_stats/sunkern.asm @@ -8,7 +8,7 @@ db 52 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/swinub.asm b/data/pokemon/base_stats/swinub.asm similarity index 96% rename from data/base_stats/swinub.asm rename to data/pokemon/base_stats/swinub.asm index 70b389b30..37f1dd67d 100644 --- a/data/base_stats/swinub.asm +++ b/data/pokemon/base_stats/swinub.asm @@ -8,7 +8,7 @@ db 78 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm similarity index 96% rename from data/base_stats/tangela.asm rename to data/pokemon/base_stats/tangela.asm index d379fdb92..9bb27ffca 100644 --- a/data/base_stats/tangela.asm +++ b/data/pokemon/base_stats/tangela.asm @@ -8,7 +8,7 @@ db 166 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm similarity index 96% rename from data/base_stats/tauros.asm rename to data/pokemon/base_stats/tauros.asm index 365de3f8d..553458e83 100644 --- a/data/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.asm @@ -8,7 +8,7 @@ db 211 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 0 ; gender + db GENDER_F0 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/teddiursa.asm b/data/pokemon/base_stats/teddiursa.asm similarity index 96% rename from data/base_stats/teddiursa.asm rename to data/pokemon/base_stats/teddiursa.asm index 0269d4c68..d636aed87 100644 --- a/data/base_stats/teddiursa.asm +++ b/data/pokemon/base_stats/teddiursa.asm @@ -8,7 +8,7 @@ db 124 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm similarity index 96% rename from data/base_stats/tentacool.asm rename to data/pokemon/base_stats/tentacool.asm index e225309e5..b13879b47 100644 --- a/data/base_stats/tentacool.asm +++ b/data/pokemon/base_stats/tentacool.asm @@ -8,7 +8,7 @@ db 105 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm similarity index 96% rename from data/base_stats/tentacruel.asm rename to data/pokemon/base_stats/tentacruel.asm index 22b2a3808..a678d13a8 100644 --- a/data/base_stats/tentacruel.asm +++ b/data/pokemon/base_stats/tentacruel.asm @@ -8,7 +8,7 @@ db 205 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/togepi.asm b/data/pokemon/base_stats/togepi.asm similarity index 96% rename from data/base_stats/togepi.asm rename to data/pokemon/base_stats/togepi.asm index 1bf6cc339..51249de6d 100644 --- a/data/base_stats/togepi.asm +++ b/data/pokemon/base_stats/togepi.asm @@ -8,7 +8,7 @@ db 74 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/togetic.asm b/data/pokemon/base_stats/togetic.asm similarity index 96% rename from data/base_stats/togetic.asm rename to data/pokemon/base_stats/togetic.asm index f8330c50f..4fc94103d 100644 --- a/data/base_stats/togetic.asm +++ b/data/pokemon/base_stats/togetic.asm @@ -8,7 +8,7 @@ db 114 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/totodile.asm b/data/pokemon/base_stats/totodile.asm similarity index 96% rename from data/base_stats/totodile.asm rename to data/pokemon/base_stats/totodile.asm index 3d57dbc89..1753d5af0 100644 --- a/data/base_stats/totodile.asm +++ b/data/pokemon/base_stats/totodile.asm @@ -8,7 +8,7 @@ db 66 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/typhlosion.asm b/data/pokemon/base_stats/typhlosion.asm similarity index 96% rename from data/base_stats/typhlosion.asm rename to data/pokemon/base_stats/typhlosion.asm index a73529cef..698a4e0a0 100644 --- a/data/base_stats/typhlosion.asm +++ b/data/pokemon/base_stats/typhlosion.asm @@ -8,7 +8,7 @@ db 209 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/tyranitar.asm b/data/pokemon/base_stats/tyranitar.asm similarity index 96% rename from data/base_stats/tyranitar.asm rename to data/pokemon/base_stats/tyranitar.asm index c116bdde3..b695007f1 100644 --- a/data/base_stats/tyranitar.asm +++ b/data/pokemon/base_stats/tyranitar.asm @@ -8,7 +8,7 @@ db 218 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/tyrogue.asm b/data/pokemon/base_stats/tyrogue.asm similarity index 96% rename from data/base_stats/tyrogue.asm rename to data/pokemon/base_stats/tyrogue.asm index 87d44a3c5..4e5e7ee43 100644 --- a/data/base_stats/tyrogue.asm +++ b/data/pokemon/base_stats/tyrogue.asm @@ -8,7 +8,7 @@ db 91 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 0 ; gender + db GENDER_F0 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/umbreon.asm b/data/pokemon/base_stats/umbreon.asm similarity index 96% rename from data/base_stats/umbreon.asm rename to data/pokemon/base_stats/umbreon.asm index 1274f6afa..dbda2b3b6 100644 --- a/data/base_stats/umbreon.asm +++ b/data/pokemon/base_stats/umbreon.asm @@ -8,7 +8,7 @@ db 197 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/unown.asm b/data/pokemon/base_stats/unown.asm similarity index 94% rename from data/base_stats/unown.asm rename to data/pokemon/base_stats/unown.asm index d447757eb..0b13f3eca 100644 --- a/data/base_stats/unown.asm +++ b/data/pokemon/base_stats/unown.asm @@ -8,7 +8,7 @@ db 61 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ursaring.asm b/data/pokemon/base_stats/ursaring.asm similarity index 96% rename from data/base_stats/ursaring.asm rename to data/pokemon/base_stats/ursaring.asm index ba87a54ff..7aa8a4265 100644 --- a/data/base_stats/ursaring.asm +++ b/data/pokemon/base_stats/ursaring.asm @@ -8,7 +8,7 @@ db 189 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm similarity index 96% rename from data/base_stats/vaporeon.asm rename to data/pokemon/base_stats/vaporeon.asm index 7d024d5fd..0e55a1946 100644 --- a/data/base_stats/vaporeon.asm +++ b/data/pokemon/base_stats/vaporeon.asm @@ -8,7 +8,7 @@ db 196 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm similarity index 96% rename from data/base_stats/venomoth.asm rename to data/pokemon/base_stats/venomoth.asm index c2ac64222..4e813b3aa 100644 --- a/data/base_stats/venomoth.asm +++ b/data/pokemon/base_stats/venomoth.asm @@ -8,7 +8,7 @@ db 138 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm similarity index 96% rename from data/base_stats/venonat.asm rename to data/pokemon/base_stats/venonat.asm index ef662fb91..5db99f8a1 100644 --- a/data/base_stats/venonat.asm +++ b/data/pokemon/base_stats/venonat.asm @@ -8,7 +8,7 @@ db 75 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm similarity index 96% rename from data/base_stats/venusaur.asm rename to data/pokemon/base_stats/venusaur.asm index 728508bee..f5d6a3a33 100644 --- a/data/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.asm @@ -8,7 +8,7 @@ db 208 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm similarity index 96% rename from data/base_stats/victreebel.asm rename to data/pokemon/base_stats/victreebel.asm index fd33d5c1c..0efade3ad 100644 --- a/data/base_stats/victreebel.asm +++ b/data/pokemon/base_stats/victreebel.asm @@ -8,7 +8,7 @@ db 191 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm similarity index 96% rename from data/base_stats/vileplume.asm rename to data/pokemon/base_stats/vileplume.asm index f6f4b370e..12170e167 100644 --- a/data/base_stats/vileplume.asm +++ b/data/pokemon/base_stats/vileplume.asm @@ -8,7 +8,7 @@ db 184 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm similarity index 96% rename from data/base_stats/voltorb.asm rename to data/pokemon/base_stats/voltorb.asm index 5daf64af9..7c2255729 100644 --- a/data/base_stats/voltorb.asm +++ b/data/pokemon/base_stats/voltorb.asm @@ -8,7 +8,7 @@ db 103 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm similarity index 96% rename from data/base_stats/vulpix.asm rename to data/pokemon/base_stats/vulpix.asm index 0212212ff..9cea11f93 100644 --- a/data/base_stats/vulpix.asm +++ b/data/pokemon/base_stats/vulpix.asm @@ -8,7 +8,7 @@ db 63 ; base exp db BURNT_BERRY ; item 1 db BURNT_BERRY ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm similarity index 96% rename from data/base_stats/wartortle.asm rename to data/pokemon/base_stats/wartortle.asm index 751d881ef..437342a8b 100644 --- a/data/base_stats/wartortle.asm +++ b/data/pokemon/base_stats/wartortle.asm @@ -8,7 +8,7 @@ db 143 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm similarity index 94% rename from data/base_stats/weedle.asm rename to data/pokemon/base_stats/weedle.asm index acc241e74..b47a720ec 100644 --- a/data/base_stats/weedle.asm +++ b/data/pokemon/base_stats/weedle.asm @@ -8,7 +8,7 @@ db 52 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm similarity index 96% rename from data/base_stats/weepinbell.asm rename to data/pokemon/base_stats/weepinbell.asm index b87ba6326..4a70c5bb2 100644 --- a/data/base_stats/weepinbell.asm +++ b/data/pokemon/base_stats/weepinbell.asm @@ -8,7 +8,7 @@ db 151 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm similarity index 96% rename from data/base_stats/weezing.asm rename to data/pokemon/base_stats/weezing.asm index 96a645828..49161c69b 100644 --- a/data/base_stats/weezing.asm +++ b/data/pokemon/base_stats/weezing.asm @@ -8,7 +8,7 @@ db 173 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm similarity index 97% rename from data/base_stats/wigglytuff.asm rename to data/pokemon/base_stats/wigglytuff.asm index 82321d595..ff1910c0e 100644 --- a/data/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -8,7 +8,7 @@ db 109 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/wobbuffet.asm b/data/pokemon/base_stats/wobbuffet.asm similarity index 94% rename from data/base_stats/wobbuffet.asm rename to data/pokemon/base_stats/wobbuffet.asm index 4b865b33c..c476dd828 100644 --- a/data/base_stats/wobbuffet.asm +++ b/data/pokemon/base_stats/wobbuffet.asm @@ -8,7 +8,7 @@ db 177 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/wooper.asm b/data/pokemon/base_stats/wooper.asm similarity index 96% rename from data/base_stats/wooper.asm rename to data/pokemon/base_stats/wooper.asm index 0f0d53630..6e621fe4b 100644 --- a/data/base_stats/wooper.asm +++ b/data/pokemon/base_stats/wooper.asm @@ -8,7 +8,7 @@ db 52 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/xatu.asm b/data/pokemon/base_stats/xatu.asm similarity index 96% rename from data/base_stats/xatu.asm rename to data/pokemon/base_stats/xatu.asm index ba0e964af..77388858e 100644 --- a/data/base_stats/xatu.asm +++ b/data/pokemon/base_stats/xatu.asm @@ -8,7 +8,7 @@ db 171 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/yanma.asm b/data/pokemon/base_stats/yanma.asm similarity index 96% rename from data/base_stats/yanma.asm rename to data/pokemon/base_stats/yanma.asm index 96cf497be..98449c720 100644 --- a/data/base_stats/yanma.asm +++ b/data/pokemon/base_stats/yanma.asm @@ -8,7 +8,7 @@ db 147 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm similarity index 96% rename from data/base_stats/zapdos.asm rename to data/pokemon/base_stats/zapdos.asm index eece9b897..44c1a8e82 100644 --- a/data/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -8,7 +8,7 @@ db 216 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm similarity index 95% rename from data/base_stats/zubat.asm rename to data/pokemon/base_stats/zubat.asm index ac5f450d1..e8fd33ea2 100644 --- a/data/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -8,7 +8,7 @@ db 54 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/audio/cry_headers.asm b/data/pokemon/cry_headers.asm similarity index 99% rename from audio/cry_headers.asm rename to data/pokemon/cry_headers.asm index 863539dc9..0651fa7f1 100644 --- a/audio/cry_headers.asm +++ b/data/pokemon/cry_headers.asm @@ -1,4 +1,5 @@ -; f2787 +CryHeaders:: ; f2787 +; entries correspond to constants/pokemon_constants.asm ; index, pitch, length BulbasaurCryHeader: cry_header CRY_BULBASAUR, $080, $081 IvysaurCryHeader: cry_header CRY_BULBASAUR, $020, $100 diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm new file mode 100644 index 000000000..92b9c6b06 --- /dev/null +++ b/data/pokemon/dex_entries.asm @@ -0,0 +1,272 @@ +INCLUDE "includes.asm" + + +SECTION "Pokedex Entries 001-064", ROMX + +PokedexEntries1:: +BulbasaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bulbasaur.asm" +IvysaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ivysaur.asm" +VenusaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venusaur.asm" +CharmanderPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charmander.asm" +CharmeleonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charmeleon.asm" +CharizardPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charizard.asm" +SquirtlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/squirtle.asm" +WartortlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/wartortle.asm" +BlastoisePokedexEntry:: INCLUDE "data/pokemon/dex_entries/blastoise.asm" +CaterpiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/caterpie.asm" +MetapodPokedexEntry:: INCLUDE "data/pokemon/dex_entries/metapod.asm" +ButterfreePokedexEntry:: INCLUDE "data/pokemon/dex_entries/butterfree.asm" +WeedlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/weedle.asm" +KakunaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kakuna.asm" +BeedrillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/beedrill.asm" +PidgeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgey.asm" +PidgeottoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgeotto.asm" +PidgeotPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgeot.asm" +RattataPokedexEntry:: INCLUDE "data/pokemon/dex_entries/rattata.asm" +RaticatePokedexEntry:: INCLUDE "data/pokemon/dex_entries/raticate.asm" +SpearowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/spearow.asm" +FearowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/fearow.asm" +EkansPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ekans.asm" +ArbokPokedexEntry:: INCLUDE "data/pokemon/dex_entries/arbok.asm" +PikachuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pikachu.asm" +RaichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/raichu.asm" +SandshrewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sandshrew.asm" +SandslashPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sandslash.asm" +NidoranFPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoran_f.asm" +NidorinaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidorina.asm" +NidoqueenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoqueen.asm" +NidoranMPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoran_m.asm" +NidorinoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidorino.asm" +NidokingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoking.asm" +ClefairyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/clefairy.asm" +ClefablePokedexEntry:: INCLUDE "data/pokemon/dex_entries/clefable.asm" +VulpixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/vulpix.asm" +NinetalesPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ninetales.asm" +JigglypuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jigglypuff.asm" +WigglytuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wigglytuff.asm" +ZubatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/zubat.asm" +GolbatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/golbat.asm" +OddishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/oddish.asm" +GloomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gloom.asm" +VileplumePokedexEntry:: INCLUDE "data/pokemon/dex_entries/vileplume.asm" +ParasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/paras.asm" +ParasectPokedexEntry:: INCLUDE "data/pokemon/dex_entries/parasect.asm" +VenonatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venonat.asm" +VenomothPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venomoth.asm" +DiglettPokedexEntry:: INCLUDE "data/pokemon/dex_entries/diglett.asm" +DugtrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dugtrio.asm" +MeowthPokedexEntry:: INCLUDE "data/pokemon/dex_entries/meowth.asm" +PersianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/persian.asm" +PsyduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/psyduck.asm" +GolduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/golduck.asm" +MankeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mankey.asm" +PrimeapePokedexEntry:: INCLUDE "data/pokemon/dex_entries/primeape.asm" +GrowlithePokedexEntry:: INCLUDE "data/pokemon/dex_entries/growlithe.asm" +ArcaninePokedexEntry:: INCLUDE "data/pokemon/dex_entries/arcanine.asm" +PoliwagPokedexEntry:: INCLUDE "data/pokemon/dex_entries/poliwag.asm" +PoliwhirlPokedexEntry:: INCLUDE "data/pokemon/dex_entries/poliwhirl.asm" +PoliwrathPokedexEntry:: INCLUDE "data/pokemon/dex_entries/poliwrath.asm" +AbraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/abra.asm" +KadabraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kadabra.asm" + + +SECTION "Pokedex Entries 065-128", ROMX + +PokedexEntries2:: +AlakazamPokedexEntry:: INCLUDE "data/pokemon/dex_entries/alakazam.asm" +MachopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/machop.asm" +MachokePokedexEntry:: INCLUDE "data/pokemon/dex_entries/machoke.asm" +MachampPokedexEntry:: INCLUDE "data/pokemon/dex_entries/machamp.asm" +BellsproutPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bellsprout.asm" +WeepinbellPokedexEntry:: INCLUDE "data/pokemon/dex_entries/weepinbell.asm" +VictreebelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/victreebel.asm" +TentacoolPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tentacool.asm" +TentacruelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tentacruel.asm" +GeodudePokedexEntry:: INCLUDE "data/pokemon/dex_entries/geodude.asm" +GravelerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/graveler.asm" +GolemPokedexEntry:: INCLUDE "data/pokemon/dex_entries/golem.asm" +PonytaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ponyta.asm" +RapidashPokedexEntry:: INCLUDE "data/pokemon/dex_entries/rapidash.asm" +SlowpokePokedexEntry:: INCLUDE "data/pokemon/dex_entries/slowpoke.asm" +SlowbroPokedexEntry:: INCLUDE "data/pokemon/dex_entries/slowbro.asm" +MagnemitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnemite.asm" +MagnetonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magneton.asm" +FarfetchDPokedexEntry:: INCLUDE "data/pokemon/dex_entries/farfetch_d.asm" +DoduoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/doduo.asm" +DodrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dodrio.asm" +SeelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seel.asm" +DewgongPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dewgong.asm" +GrimerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/grimer.asm" +MukPokedexEntry:: INCLUDE "data/pokemon/dex_entries/muk.asm" +ShellderPokedexEntry:: INCLUDE "data/pokemon/dex_entries/shellder.asm" +CloysterPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cloyster.asm" +GastlyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gastly.asm" +HaunterPokedexEntry:: INCLUDE "data/pokemon/dex_entries/haunter.asm" +GengarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gengar.asm" +OnixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/onix.asm" +DrowzeePokedexEntry:: INCLUDE "data/pokemon/dex_entries/drowzee.asm" +HypnoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hypno.asm" +KrabbyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/krabby.asm" +KinglerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kingler.asm" +VoltorbPokedexEntry:: INCLUDE "data/pokemon/dex_entries/voltorb.asm" +ElectrodePokedexEntry:: INCLUDE "data/pokemon/dex_entries/electrode.asm" +ExeggcutePokedexEntry:: INCLUDE "data/pokemon/dex_entries/exeggcute.asm" +ExeggutorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/exeggutor.asm" +CubonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/cubone.asm" +MarowakPokedexEntry:: INCLUDE "data/pokemon/dex_entries/marowak.asm" +HitmonleePokedexEntry:: INCLUDE "data/pokemon/dex_entries/hitmonlee.asm" +HitmonchanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hitmonchan.asm" +LickitungPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lickitung.asm" +KoffingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/koffing.asm" +WeezingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/weezing.asm" +RhyhornPokedexEntry:: INCLUDE "data/pokemon/dex_entries/rhyhorn.asm" +RhydonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/rhydon.asm" +ChanseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/chansey.asm" +TangelaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tangela.asm" +KangaskhanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kangaskhan.asm" +HorseaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/horsea.asm" +SeadraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seadra.asm" +GoldeenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/goldeen.asm" +SeakingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seaking.asm" +StaryuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/staryu.asm" +StarmiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/starmie.asm" +MrMimePokedexEntry:: INCLUDE "data/pokemon/dex_entries/mr__mime.asm" +ScytherPokedexEntry:: INCLUDE "data/pokemon/dex_entries/scyther.asm" +JynxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jynx.asm" +ElectabuzzPokedexEntry:: INCLUDE "data/pokemon/dex_entries/electabuzz.asm" +MagmarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magmar.asm" +PinsirPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pinsir.asm" +TaurosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tauros.asm" + + +SECTION "Pokedex Entries 129-192", ROMX + +PokedexEntries3:: +MagikarpPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magikarp.asm" +GyaradosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gyarados.asm" +LaprasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lapras.asm" +DittoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ditto.asm" +EeveePokedexEntry:: INCLUDE "data/pokemon/dex_entries/eevee.asm" +VaporeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/vaporeon.asm" +JolteonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jolteon.asm" +FlareonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/flareon.asm" +PorygonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/porygon.asm" +OmanytePokedexEntry:: INCLUDE "data/pokemon/dex_entries/omanyte.asm" +OmastarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/omastar.asm" +KabutoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kabuto.asm" +KabutopsPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kabutops.asm" +AerodactylPokedexEntry:: INCLUDE "data/pokemon/dex_entries/aerodactyl.asm" +SnorlaxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/snorlax.asm" +ArticunoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/articuno.asm" +ZapdosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/zapdos.asm" +MoltresPokedexEntry:: INCLUDE "data/pokemon/dex_entries/moltres.asm" +DratiniPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dratini.asm" +DragonairPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dragonair.asm" +DragonitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/dragonite.asm" +MewtwoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mewtwo.asm" +MewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mew.asm" +ChikoritaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/chikorita.asm" +BayleefPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bayleef.asm" +MeganiumPokedexEntry:: INCLUDE "data/pokemon/dex_entries/meganium.asm" +CyndaquilPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cyndaquil.asm" +QuilavaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/quilava.asm" +TyphlosionPokedexEntry:: INCLUDE "data/pokemon/dex_entries/typhlosion.asm" +TotodilePokedexEntry:: INCLUDE "data/pokemon/dex_entries/totodile.asm" +CroconawPokedexEntry:: INCLUDE "data/pokemon/dex_entries/croconaw.asm" +FeraligatrPokedexEntry:: INCLUDE "data/pokemon/dex_entries/feraligatr.asm" +SentretPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sentret.asm" +FurretPokedexEntry:: INCLUDE "data/pokemon/dex_entries/furret.asm" +HoothootPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hoothoot.asm" +NoctowlPokedexEntry:: INCLUDE "data/pokemon/dex_entries/noctowl.asm" +LedybaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ledyba.asm" +LedianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ledian.asm" +SpinarakPokedexEntry:: INCLUDE "data/pokemon/dex_entries/spinarak.asm" +AriadosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ariados.asm" +CrobatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/crobat.asm" +ChinchouPokedexEntry:: INCLUDE "data/pokemon/dex_entries/chinchou.asm" +LanturnPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lanturn.asm" +PichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pichu.asm" +CleffaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cleffa.asm" +IgglybuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/igglybuff.asm" +TogepiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/togepi.asm" +TogeticPokedexEntry:: INCLUDE "data/pokemon/dex_entries/togetic.asm" +NatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/natu.asm" +XatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/xatu.asm" +MareepPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mareep.asm" +FlaaffyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/flaaffy.asm" +AmpharosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ampharos.asm" +BellossomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bellossom.asm" +MarillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/marill.asm" +AzumarillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/azumarill.asm" +SudowoodoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sudowoodo.asm" +PolitoedPokedexEntry:: INCLUDE "data/pokemon/dex_entries/politoed.asm" +HoppipPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hoppip.asm" +SkiploomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/skiploom.asm" +JumpluffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jumpluff.asm" +AipomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/aipom.asm" +SunkernPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunkern.asm" +SunfloraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunflora.asm" + + +SECTION "Pokedex Entries 193-251", ROMX + +PokedexEntries4:: +YanmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/yanma.asm" +WooperPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wooper.asm" +QuagsirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/quagsire.asm" +EspeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/espeon.asm" +UmbreonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/umbreon.asm" +MurkrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/murkrow.asm" +SlowkingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/slowking.asm" +MisdreavusPokedexEntry:: INCLUDE "data/pokemon/dex_entries/misdreavus.asm" +UnownPokedexEntry:: INCLUDE "data/pokemon/dex_entries/unown.asm" +WobbuffetPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wobbuffet.asm" +GirafarigPokedexEntry:: INCLUDE "data/pokemon/dex_entries/girafarig.asm" +PinecoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pineco.asm" +ForretressPokedexEntry:: INCLUDE "data/pokemon/dex_entries/forretress.asm" +DunsparcePokedexEntry:: INCLUDE "data/pokemon/dex_entries/dunsparce.asm" +GligarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gligar.asm" +SteelixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/steelix.asm" +SnubbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/snubbull.asm" +GranbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/granbull.asm" +QwilfishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/qwilfish.asm" +ScizorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/scizor.asm" +ShucklePokedexEntry:: INCLUDE "data/pokemon/dex_entries/shuckle.asm" +HeracrossPokedexEntry:: INCLUDE "data/pokemon/dex_entries/heracross.asm" +SneaselPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sneasel.asm" +TeddiursaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/teddiursa.asm" +UrsaringPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ursaring.asm" +SlugmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/slugma.asm" +MagcargoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magcargo.asm" +SwinubPokedexEntry:: INCLUDE "data/pokemon/dex_entries/swinub.asm" +PiloswinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/piloswine.asm" +CorsolaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/corsola.asm" +RemoraidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/remoraid.asm" +OctilleryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/octillery.asm" +DelibirdPokedexEntry:: INCLUDE "data/pokemon/dex_entries/delibird.asm" +MantinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/mantine.asm" +SkarmoryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/skarmory.asm" +HoundourPokedexEntry:: INCLUDE "data/pokemon/dex_entries/houndour.asm" +HoundoomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/houndoom.asm" +KingdraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kingdra.asm" +PhanpyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/phanpy.asm" +DonphanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/donphan.asm" +Porygon2PokedexEntry:: INCLUDE "data/pokemon/dex_entries/porygon2.asm" +StantlerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/stantler.asm" +SmearglePokedexEntry:: INCLUDE "data/pokemon/dex_entries/smeargle.asm" +TyroguePokedexEntry:: INCLUDE "data/pokemon/dex_entries/tyrogue.asm" +HitmontopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hitmontop.asm" +SmoochumPokedexEntry:: INCLUDE "data/pokemon/dex_entries/smoochum.asm" +ElekidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/elekid.asm" +MagbyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magby.asm" +MiltankPokedexEntry:: INCLUDE "data/pokemon/dex_entries/miltank.asm" +BlisseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/blissey.asm" +RaikouPokedexEntry:: INCLUDE "data/pokemon/dex_entries/raikou.asm" +EnteiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/entei.asm" +SuicunePokedexEntry:: INCLUDE "data/pokemon/dex_entries/suicune.asm" +LarvitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/larvitar.asm" +PupitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pupitar.asm" +TyranitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tyranitar.asm" +LugiaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lugia.asm" +HoOhPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ho_oh.asm" +CelebiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/celebi.asm" diff --git a/data/pokedex/entries/abra.asm b/data/pokemon/dex_entries/abra.asm similarity index 100% rename from data/pokedex/entries/abra.asm rename to data/pokemon/dex_entries/abra.asm diff --git a/data/pokedex/entries/aerodactyl.asm b/data/pokemon/dex_entries/aerodactyl.asm similarity index 100% rename from data/pokedex/entries/aerodactyl.asm rename to data/pokemon/dex_entries/aerodactyl.asm diff --git a/data/pokedex/entries/aipom.asm b/data/pokemon/dex_entries/aipom.asm similarity index 100% rename from data/pokedex/entries/aipom.asm rename to data/pokemon/dex_entries/aipom.asm diff --git a/data/pokedex/entries/alakazam.asm b/data/pokemon/dex_entries/alakazam.asm similarity index 100% rename from data/pokedex/entries/alakazam.asm rename to data/pokemon/dex_entries/alakazam.asm diff --git a/data/pokedex/entries/ampharos.asm b/data/pokemon/dex_entries/ampharos.asm similarity index 100% rename from data/pokedex/entries/ampharos.asm rename to data/pokemon/dex_entries/ampharos.asm diff --git a/data/pokedex/entries/arbok.asm b/data/pokemon/dex_entries/arbok.asm similarity index 100% rename from data/pokedex/entries/arbok.asm rename to data/pokemon/dex_entries/arbok.asm diff --git a/data/pokedex/entries/arcanine.asm b/data/pokemon/dex_entries/arcanine.asm similarity index 100% rename from data/pokedex/entries/arcanine.asm rename to data/pokemon/dex_entries/arcanine.asm diff --git a/data/pokedex/entries/ariados.asm b/data/pokemon/dex_entries/ariados.asm similarity index 100% rename from data/pokedex/entries/ariados.asm rename to data/pokemon/dex_entries/ariados.asm diff --git a/data/pokedex/entries/articuno.asm b/data/pokemon/dex_entries/articuno.asm similarity index 100% rename from data/pokedex/entries/articuno.asm rename to data/pokemon/dex_entries/articuno.asm diff --git a/data/pokedex/entries/azumarill.asm b/data/pokemon/dex_entries/azumarill.asm similarity index 100% rename from data/pokedex/entries/azumarill.asm rename to data/pokemon/dex_entries/azumarill.asm diff --git a/data/pokedex/entries/bayleef.asm b/data/pokemon/dex_entries/bayleef.asm similarity index 100% rename from data/pokedex/entries/bayleef.asm rename to data/pokemon/dex_entries/bayleef.asm diff --git a/data/pokedex/entries/beedrill.asm b/data/pokemon/dex_entries/beedrill.asm similarity index 100% rename from data/pokedex/entries/beedrill.asm rename to data/pokemon/dex_entries/beedrill.asm diff --git a/data/pokedex/entries/bellossom.asm b/data/pokemon/dex_entries/bellossom.asm similarity index 100% rename from data/pokedex/entries/bellossom.asm rename to data/pokemon/dex_entries/bellossom.asm diff --git a/data/pokedex/entries/bellsprout.asm b/data/pokemon/dex_entries/bellsprout.asm similarity index 100% rename from data/pokedex/entries/bellsprout.asm rename to data/pokemon/dex_entries/bellsprout.asm diff --git a/data/pokedex/entries/blastoise.asm b/data/pokemon/dex_entries/blastoise.asm similarity index 100% rename from data/pokedex/entries/blastoise.asm rename to data/pokemon/dex_entries/blastoise.asm diff --git a/data/pokedex/entries/blissey.asm b/data/pokemon/dex_entries/blissey.asm similarity index 100% rename from data/pokedex/entries/blissey.asm rename to data/pokemon/dex_entries/blissey.asm diff --git a/data/pokedex/entries/bulbasaur.asm b/data/pokemon/dex_entries/bulbasaur.asm similarity index 100% rename from data/pokedex/entries/bulbasaur.asm rename to data/pokemon/dex_entries/bulbasaur.asm diff --git a/data/pokedex/entries/butterfree.asm b/data/pokemon/dex_entries/butterfree.asm similarity index 100% rename from data/pokedex/entries/butterfree.asm rename to data/pokemon/dex_entries/butterfree.asm diff --git a/data/pokedex/entries/caterpie.asm b/data/pokemon/dex_entries/caterpie.asm similarity index 100% rename from data/pokedex/entries/caterpie.asm rename to data/pokemon/dex_entries/caterpie.asm diff --git a/data/pokedex/entries/celebi.asm b/data/pokemon/dex_entries/celebi.asm similarity index 100% rename from data/pokedex/entries/celebi.asm rename to data/pokemon/dex_entries/celebi.asm diff --git a/data/pokedex/entries/chansey.asm b/data/pokemon/dex_entries/chansey.asm similarity index 100% rename from data/pokedex/entries/chansey.asm rename to data/pokemon/dex_entries/chansey.asm diff --git a/data/pokedex/entries/charizard.asm b/data/pokemon/dex_entries/charizard.asm similarity index 100% rename from data/pokedex/entries/charizard.asm rename to data/pokemon/dex_entries/charizard.asm diff --git a/data/pokedex/entries/charmander.asm b/data/pokemon/dex_entries/charmander.asm similarity index 100% rename from data/pokedex/entries/charmander.asm rename to data/pokemon/dex_entries/charmander.asm diff --git a/data/pokedex/entries/charmeleon.asm b/data/pokemon/dex_entries/charmeleon.asm similarity index 100% rename from data/pokedex/entries/charmeleon.asm rename to data/pokemon/dex_entries/charmeleon.asm diff --git a/data/pokedex/entries/chikorita.asm b/data/pokemon/dex_entries/chikorita.asm similarity index 100% rename from data/pokedex/entries/chikorita.asm rename to data/pokemon/dex_entries/chikorita.asm diff --git a/data/pokedex/entries/chinchou.asm b/data/pokemon/dex_entries/chinchou.asm similarity index 100% rename from data/pokedex/entries/chinchou.asm rename to data/pokemon/dex_entries/chinchou.asm diff --git a/data/pokedex/entries/clefable.asm b/data/pokemon/dex_entries/clefable.asm similarity index 100% rename from data/pokedex/entries/clefable.asm rename to data/pokemon/dex_entries/clefable.asm diff --git a/data/pokedex/entries/clefairy.asm b/data/pokemon/dex_entries/clefairy.asm similarity index 100% rename from data/pokedex/entries/clefairy.asm rename to data/pokemon/dex_entries/clefairy.asm diff --git a/data/pokedex/entries/cleffa.asm b/data/pokemon/dex_entries/cleffa.asm similarity index 100% rename from data/pokedex/entries/cleffa.asm rename to data/pokemon/dex_entries/cleffa.asm diff --git a/data/pokedex/entries/cloyster.asm b/data/pokemon/dex_entries/cloyster.asm similarity index 100% rename from data/pokedex/entries/cloyster.asm rename to data/pokemon/dex_entries/cloyster.asm diff --git a/data/pokedex/entries/corsola.asm b/data/pokemon/dex_entries/corsola.asm similarity index 100% rename from data/pokedex/entries/corsola.asm rename to data/pokemon/dex_entries/corsola.asm diff --git a/data/pokedex/entries/crobat.asm b/data/pokemon/dex_entries/crobat.asm similarity index 100% rename from data/pokedex/entries/crobat.asm rename to data/pokemon/dex_entries/crobat.asm diff --git a/data/pokedex/entries/croconaw.asm b/data/pokemon/dex_entries/croconaw.asm similarity index 100% rename from data/pokedex/entries/croconaw.asm rename to data/pokemon/dex_entries/croconaw.asm diff --git a/data/pokedex/entries/cubone.asm b/data/pokemon/dex_entries/cubone.asm similarity index 100% rename from data/pokedex/entries/cubone.asm rename to data/pokemon/dex_entries/cubone.asm diff --git a/data/pokedex/entries/cyndaquil.asm b/data/pokemon/dex_entries/cyndaquil.asm similarity index 100% rename from data/pokedex/entries/cyndaquil.asm rename to data/pokemon/dex_entries/cyndaquil.asm diff --git a/data/pokedex/entries/delibird.asm b/data/pokemon/dex_entries/delibird.asm similarity index 100% rename from data/pokedex/entries/delibird.asm rename to data/pokemon/dex_entries/delibird.asm diff --git a/data/pokedex/entries/dewgong.asm b/data/pokemon/dex_entries/dewgong.asm similarity index 100% rename from data/pokedex/entries/dewgong.asm rename to data/pokemon/dex_entries/dewgong.asm diff --git a/data/pokedex/entries/diglett.asm b/data/pokemon/dex_entries/diglett.asm similarity index 100% rename from data/pokedex/entries/diglett.asm rename to data/pokemon/dex_entries/diglett.asm diff --git a/data/pokedex/entries/ditto.asm b/data/pokemon/dex_entries/ditto.asm similarity index 100% rename from data/pokedex/entries/ditto.asm rename to data/pokemon/dex_entries/ditto.asm diff --git a/data/pokedex/entries/dodrio.asm b/data/pokemon/dex_entries/dodrio.asm similarity index 100% rename from data/pokedex/entries/dodrio.asm rename to data/pokemon/dex_entries/dodrio.asm diff --git a/data/pokedex/entries/doduo.asm b/data/pokemon/dex_entries/doduo.asm similarity index 100% rename from data/pokedex/entries/doduo.asm rename to data/pokemon/dex_entries/doduo.asm diff --git a/data/pokedex/entries/donphan.asm b/data/pokemon/dex_entries/donphan.asm similarity index 100% rename from data/pokedex/entries/donphan.asm rename to data/pokemon/dex_entries/donphan.asm diff --git a/data/pokedex/entries/dragonair.asm b/data/pokemon/dex_entries/dragonair.asm similarity index 100% rename from data/pokedex/entries/dragonair.asm rename to data/pokemon/dex_entries/dragonair.asm diff --git a/data/pokedex/entries/dragonite.asm b/data/pokemon/dex_entries/dragonite.asm similarity index 100% rename from data/pokedex/entries/dragonite.asm rename to data/pokemon/dex_entries/dragonite.asm diff --git a/data/pokedex/entries/dratini.asm b/data/pokemon/dex_entries/dratini.asm similarity index 100% rename from data/pokedex/entries/dratini.asm rename to data/pokemon/dex_entries/dratini.asm diff --git a/data/pokedex/entries/drowzee.asm b/data/pokemon/dex_entries/drowzee.asm similarity index 100% rename from data/pokedex/entries/drowzee.asm rename to data/pokemon/dex_entries/drowzee.asm diff --git a/data/pokedex/entries/dugtrio.asm b/data/pokemon/dex_entries/dugtrio.asm similarity index 100% rename from data/pokedex/entries/dugtrio.asm rename to data/pokemon/dex_entries/dugtrio.asm diff --git a/data/pokedex/entries/dunsparce.asm b/data/pokemon/dex_entries/dunsparce.asm similarity index 100% rename from data/pokedex/entries/dunsparce.asm rename to data/pokemon/dex_entries/dunsparce.asm diff --git a/data/pokedex/entries/eevee.asm b/data/pokemon/dex_entries/eevee.asm similarity index 100% rename from data/pokedex/entries/eevee.asm rename to data/pokemon/dex_entries/eevee.asm diff --git a/data/pokedex/entries/ekans.asm b/data/pokemon/dex_entries/ekans.asm similarity index 100% rename from data/pokedex/entries/ekans.asm rename to data/pokemon/dex_entries/ekans.asm diff --git a/data/pokedex/entries/electabuzz.asm b/data/pokemon/dex_entries/electabuzz.asm similarity index 100% rename from data/pokedex/entries/electabuzz.asm rename to data/pokemon/dex_entries/electabuzz.asm diff --git a/data/pokedex/entries/electrode.asm b/data/pokemon/dex_entries/electrode.asm similarity index 100% rename from data/pokedex/entries/electrode.asm rename to data/pokemon/dex_entries/electrode.asm diff --git a/data/pokedex/entries/elekid.asm b/data/pokemon/dex_entries/elekid.asm similarity index 100% rename from data/pokedex/entries/elekid.asm rename to data/pokemon/dex_entries/elekid.asm diff --git a/data/pokedex/entries/entei.asm b/data/pokemon/dex_entries/entei.asm similarity index 100% rename from data/pokedex/entries/entei.asm rename to data/pokemon/dex_entries/entei.asm diff --git a/data/pokedex/entries/espeon.asm b/data/pokemon/dex_entries/espeon.asm similarity index 100% rename from data/pokedex/entries/espeon.asm rename to data/pokemon/dex_entries/espeon.asm diff --git a/data/pokedex/entries/exeggcute.asm b/data/pokemon/dex_entries/exeggcute.asm similarity index 100% rename from data/pokedex/entries/exeggcute.asm rename to data/pokemon/dex_entries/exeggcute.asm diff --git a/data/pokedex/entries/exeggutor.asm b/data/pokemon/dex_entries/exeggutor.asm similarity index 100% rename from data/pokedex/entries/exeggutor.asm rename to data/pokemon/dex_entries/exeggutor.asm diff --git a/data/pokedex/entries/farfetch_d.asm b/data/pokemon/dex_entries/farfetch_d.asm similarity index 100% rename from data/pokedex/entries/farfetch_d.asm rename to data/pokemon/dex_entries/farfetch_d.asm diff --git a/data/pokedex/entries/fearow.asm b/data/pokemon/dex_entries/fearow.asm similarity index 100% rename from data/pokedex/entries/fearow.asm rename to data/pokemon/dex_entries/fearow.asm diff --git a/data/pokedex/entries/feraligatr.asm b/data/pokemon/dex_entries/feraligatr.asm similarity index 100% rename from data/pokedex/entries/feraligatr.asm rename to data/pokemon/dex_entries/feraligatr.asm diff --git a/data/pokedex/entries/flaaffy.asm b/data/pokemon/dex_entries/flaaffy.asm similarity index 100% rename from data/pokedex/entries/flaaffy.asm rename to data/pokemon/dex_entries/flaaffy.asm diff --git a/data/pokedex/entries/flareon.asm b/data/pokemon/dex_entries/flareon.asm similarity index 100% rename from data/pokedex/entries/flareon.asm rename to data/pokemon/dex_entries/flareon.asm diff --git a/data/pokedex/entries/forretress.asm b/data/pokemon/dex_entries/forretress.asm similarity index 100% rename from data/pokedex/entries/forretress.asm rename to data/pokemon/dex_entries/forretress.asm diff --git a/data/pokedex/entries/furret.asm b/data/pokemon/dex_entries/furret.asm similarity index 100% rename from data/pokedex/entries/furret.asm rename to data/pokemon/dex_entries/furret.asm diff --git a/data/pokedex/entries/gastly.asm b/data/pokemon/dex_entries/gastly.asm similarity index 100% rename from data/pokedex/entries/gastly.asm rename to data/pokemon/dex_entries/gastly.asm diff --git a/data/pokedex/entries/gengar.asm b/data/pokemon/dex_entries/gengar.asm similarity index 100% rename from data/pokedex/entries/gengar.asm rename to data/pokemon/dex_entries/gengar.asm diff --git a/data/pokedex/entries/geodude.asm b/data/pokemon/dex_entries/geodude.asm similarity index 100% rename from data/pokedex/entries/geodude.asm rename to data/pokemon/dex_entries/geodude.asm diff --git a/data/pokedex/entries/girafarig.asm b/data/pokemon/dex_entries/girafarig.asm similarity index 100% rename from data/pokedex/entries/girafarig.asm rename to data/pokemon/dex_entries/girafarig.asm diff --git a/data/pokedex/entries/gligar.asm b/data/pokemon/dex_entries/gligar.asm similarity index 100% rename from data/pokedex/entries/gligar.asm rename to data/pokemon/dex_entries/gligar.asm diff --git a/data/pokedex/entries/gloom.asm b/data/pokemon/dex_entries/gloom.asm similarity index 100% rename from data/pokedex/entries/gloom.asm rename to data/pokemon/dex_entries/gloom.asm diff --git a/data/pokedex/entries/golbat.asm b/data/pokemon/dex_entries/golbat.asm similarity index 100% rename from data/pokedex/entries/golbat.asm rename to data/pokemon/dex_entries/golbat.asm diff --git a/data/pokedex/entries/goldeen.asm b/data/pokemon/dex_entries/goldeen.asm similarity index 100% rename from data/pokedex/entries/goldeen.asm rename to data/pokemon/dex_entries/goldeen.asm diff --git a/data/pokedex/entries/golduck.asm b/data/pokemon/dex_entries/golduck.asm similarity index 100% rename from data/pokedex/entries/golduck.asm rename to data/pokemon/dex_entries/golduck.asm diff --git a/data/pokedex/entries/golem.asm b/data/pokemon/dex_entries/golem.asm similarity index 100% rename from data/pokedex/entries/golem.asm rename to data/pokemon/dex_entries/golem.asm diff --git a/data/pokedex/entries/granbull.asm b/data/pokemon/dex_entries/granbull.asm similarity index 100% rename from data/pokedex/entries/granbull.asm rename to data/pokemon/dex_entries/granbull.asm diff --git a/data/pokedex/entries/graveler.asm b/data/pokemon/dex_entries/graveler.asm similarity index 100% rename from data/pokedex/entries/graveler.asm rename to data/pokemon/dex_entries/graveler.asm diff --git a/data/pokedex/entries/grimer.asm b/data/pokemon/dex_entries/grimer.asm similarity index 100% rename from data/pokedex/entries/grimer.asm rename to data/pokemon/dex_entries/grimer.asm diff --git a/data/pokedex/entries/growlithe.asm b/data/pokemon/dex_entries/growlithe.asm similarity index 100% rename from data/pokedex/entries/growlithe.asm rename to data/pokemon/dex_entries/growlithe.asm diff --git a/data/pokedex/entries/gyarados.asm b/data/pokemon/dex_entries/gyarados.asm similarity index 100% rename from data/pokedex/entries/gyarados.asm rename to data/pokemon/dex_entries/gyarados.asm diff --git a/data/pokedex/entries/haunter.asm b/data/pokemon/dex_entries/haunter.asm similarity index 100% rename from data/pokedex/entries/haunter.asm rename to data/pokemon/dex_entries/haunter.asm diff --git a/data/pokedex/entries/heracross.asm b/data/pokemon/dex_entries/heracross.asm similarity index 100% rename from data/pokedex/entries/heracross.asm rename to data/pokemon/dex_entries/heracross.asm diff --git a/data/pokedex/entries/hitmonchan.asm b/data/pokemon/dex_entries/hitmonchan.asm similarity index 100% rename from data/pokedex/entries/hitmonchan.asm rename to data/pokemon/dex_entries/hitmonchan.asm diff --git a/data/pokedex/entries/hitmonlee.asm b/data/pokemon/dex_entries/hitmonlee.asm similarity index 100% rename from data/pokedex/entries/hitmonlee.asm rename to data/pokemon/dex_entries/hitmonlee.asm diff --git a/data/pokedex/entries/hitmontop.asm b/data/pokemon/dex_entries/hitmontop.asm similarity index 100% rename from data/pokedex/entries/hitmontop.asm rename to data/pokemon/dex_entries/hitmontop.asm diff --git a/data/pokedex/entries/ho_oh.asm b/data/pokemon/dex_entries/ho_oh.asm similarity index 100% rename from data/pokedex/entries/ho_oh.asm rename to data/pokemon/dex_entries/ho_oh.asm diff --git a/data/pokedex/entries/hoothoot.asm b/data/pokemon/dex_entries/hoothoot.asm similarity index 100% rename from data/pokedex/entries/hoothoot.asm rename to data/pokemon/dex_entries/hoothoot.asm diff --git a/data/pokedex/entries/hoppip.asm b/data/pokemon/dex_entries/hoppip.asm similarity index 100% rename from data/pokedex/entries/hoppip.asm rename to data/pokemon/dex_entries/hoppip.asm diff --git a/data/pokedex/entries/horsea.asm b/data/pokemon/dex_entries/horsea.asm similarity index 100% rename from data/pokedex/entries/horsea.asm rename to data/pokemon/dex_entries/horsea.asm diff --git a/data/pokedex/entries/houndoom.asm b/data/pokemon/dex_entries/houndoom.asm similarity index 100% rename from data/pokedex/entries/houndoom.asm rename to data/pokemon/dex_entries/houndoom.asm diff --git a/data/pokedex/entries/houndour.asm b/data/pokemon/dex_entries/houndour.asm similarity index 100% rename from data/pokedex/entries/houndour.asm rename to data/pokemon/dex_entries/houndour.asm diff --git a/data/pokedex/entries/hypno.asm b/data/pokemon/dex_entries/hypno.asm similarity index 100% rename from data/pokedex/entries/hypno.asm rename to data/pokemon/dex_entries/hypno.asm diff --git a/data/pokedex/entries/igglybuff.asm b/data/pokemon/dex_entries/igglybuff.asm similarity index 100% rename from data/pokedex/entries/igglybuff.asm rename to data/pokemon/dex_entries/igglybuff.asm diff --git a/data/pokedex/entries/ivysaur.asm b/data/pokemon/dex_entries/ivysaur.asm similarity index 100% rename from data/pokedex/entries/ivysaur.asm rename to data/pokemon/dex_entries/ivysaur.asm diff --git a/data/pokedex/entries/jigglypuff.asm b/data/pokemon/dex_entries/jigglypuff.asm similarity index 100% rename from data/pokedex/entries/jigglypuff.asm rename to data/pokemon/dex_entries/jigglypuff.asm diff --git a/data/pokedex/entries/jolteon.asm b/data/pokemon/dex_entries/jolteon.asm similarity index 100% rename from data/pokedex/entries/jolteon.asm rename to data/pokemon/dex_entries/jolteon.asm diff --git a/data/pokedex/entries/jumpluff.asm b/data/pokemon/dex_entries/jumpluff.asm similarity index 100% rename from data/pokedex/entries/jumpluff.asm rename to data/pokemon/dex_entries/jumpluff.asm diff --git a/data/pokedex/entries/jynx.asm b/data/pokemon/dex_entries/jynx.asm similarity index 100% rename from data/pokedex/entries/jynx.asm rename to data/pokemon/dex_entries/jynx.asm diff --git a/data/pokedex/entries/kabuto.asm b/data/pokemon/dex_entries/kabuto.asm similarity index 100% rename from data/pokedex/entries/kabuto.asm rename to data/pokemon/dex_entries/kabuto.asm diff --git a/data/pokedex/entries/kabutops.asm b/data/pokemon/dex_entries/kabutops.asm similarity index 100% rename from data/pokedex/entries/kabutops.asm rename to data/pokemon/dex_entries/kabutops.asm diff --git a/data/pokedex/entries/kadabra.asm b/data/pokemon/dex_entries/kadabra.asm similarity index 100% rename from data/pokedex/entries/kadabra.asm rename to data/pokemon/dex_entries/kadabra.asm diff --git a/data/pokedex/entries/kakuna.asm b/data/pokemon/dex_entries/kakuna.asm similarity index 100% rename from data/pokedex/entries/kakuna.asm rename to data/pokemon/dex_entries/kakuna.asm diff --git a/data/pokedex/entries/kangaskhan.asm b/data/pokemon/dex_entries/kangaskhan.asm similarity index 100% rename from data/pokedex/entries/kangaskhan.asm rename to data/pokemon/dex_entries/kangaskhan.asm diff --git a/data/pokedex/entries/kingdra.asm b/data/pokemon/dex_entries/kingdra.asm similarity index 100% rename from data/pokedex/entries/kingdra.asm rename to data/pokemon/dex_entries/kingdra.asm diff --git a/data/pokedex/entries/kingler.asm b/data/pokemon/dex_entries/kingler.asm similarity index 100% rename from data/pokedex/entries/kingler.asm rename to data/pokemon/dex_entries/kingler.asm diff --git a/data/pokedex/entries/koffing.asm b/data/pokemon/dex_entries/koffing.asm similarity index 100% rename from data/pokedex/entries/koffing.asm rename to data/pokemon/dex_entries/koffing.asm diff --git a/data/pokedex/entries/krabby.asm b/data/pokemon/dex_entries/krabby.asm similarity index 100% rename from data/pokedex/entries/krabby.asm rename to data/pokemon/dex_entries/krabby.asm diff --git a/data/pokedex/entries/lanturn.asm b/data/pokemon/dex_entries/lanturn.asm similarity index 100% rename from data/pokedex/entries/lanturn.asm rename to data/pokemon/dex_entries/lanturn.asm diff --git a/data/pokedex/entries/lapras.asm b/data/pokemon/dex_entries/lapras.asm similarity index 100% rename from data/pokedex/entries/lapras.asm rename to data/pokemon/dex_entries/lapras.asm diff --git a/data/pokedex/entries/larvitar.asm b/data/pokemon/dex_entries/larvitar.asm similarity index 100% rename from data/pokedex/entries/larvitar.asm rename to data/pokemon/dex_entries/larvitar.asm diff --git a/data/pokedex/entries/ledian.asm b/data/pokemon/dex_entries/ledian.asm similarity index 100% rename from data/pokedex/entries/ledian.asm rename to data/pokemon/dex_entries/ledian.asm diff --git a/data/pokedex/entries/ledyba.asm b/data/pokemon/dex_entries/ledyba.asm similarity index 100% rename from data/pokedex/entries/ledyba.asm rename to data/pokemon/dex_entries/ledyba.asm diff --git a/data/pokedex/entries/lickitung.asm b/data/pokemon/dex_entries/lickitung.asm similarity index 100% rename from data/pokedex/entries/lickitung.asm rename to data/pokemon/dex_entries/lickitung.asm diff --git a/data/pokedex/entries/lugia.asm b/data/pokemon/dex_entries/lugia.asm similarity index 100% rename from data/pokedex/entries/lugia.asm rename to data/pokemon/dex_entries/lugia.asm diff --git a/data/pokedex/entries/machamp.asm b/data/pokemon/dex_entries/machamp.asm similarity index 100% rename from data/pokedex/entries/machamp.asm rename to data/pokemon/dex_entries/machamp.asm diff --git a/data/pokedex/entries/machoke.asm b/data/pokemon/dex_entries/machoke.asm similarity index 100% rename from data/pokedex/entries/machoke.asm rename to data/pokemon/dex_entries/machoke.asm diff --git a/data/pokedex/entries/machop.asm b/data/pokemon/dex_entries/machop.asm similarity index 100% rename from data/pokedex/entries/machop.asm rename to data/pokemon/dex_entries/machop.asm diff --git a/data/pokedex/entries/magby.asm b/data/pokemon/dex_entries/magby.asm similarity index 100% rename from data/pokedex/entries/magby.asm rename to data/pokemon/dex_entries/magby.asm diff --git a/data/pokedex/entries/magcargo.asm b/data/pokemon/dex_entries/magcargo.asm similarity index 100% rename from data/pokedex/entries/magcargo.asm rename to data/pokemon/dex_entries/magcargo.asm diff --git a/data/pokedex/entries/magikarp.asm b/data/pokemon/dex_entries/magikarp.asm similarity index 100% rename from data/pokedex/entries/magikarp.asm rename to data/pokemon/dex_entries/magikarp.asm diff --git a/data/pokedex/entries/magmar.asm b/data/pokemon/dex_entries/magmar.asm similarity index 100% rename from data/pokedex/entries/magmar.asm rename to data/pokemon/dex_entries/magmar.asm diff --git a/data/pokedex/entries/magnemite.asm b/data/pokemon/dex_entries/magnemite.asm similarity index 100% rename from data/pokedex/entries/magnemite.asm rename to data/pokemon/dex_entries/magnemite.asm diff --git a/data/pokedex/entries/magneton.asm b/data/pokemon/dex_entries/magneton.asm similarity index 100% rename from data/pokedex/entries/magneton.asm rename to data/pokemon/dex_entries/magneton.asm diff --git a/data/pokedex/entries/mankey.asm b/data/pokemon/dex_entries/mankey.asm similarity index 100% rename from data/pokedex/entries/mankey.asm rename to data/pokemon/dex_entries/mankey.asm diff --git a/data/pokedex/entries/mantine.asm b/data/pokemon/dex_entries/mantine.asm similarity index 100% rename from data/pokedex/entries/mantine.asm rename to data/pokemon/dex_entries/mantine.asm diff --git a/data/pokedex/entries/mareep.asm b/data/pokemon/dex_entries/mareep.asm similarity index 100% rename from data/pokedex/entries/mareep.asm rename to data/pokemon/dex_entries/mareep.asm diff --git a/data/pokedex/entries/marill.asm b/data/pokemon/dex_entries/marill.asm similarity index 100% rename from data/pokedex/entries/marill.asm rename to data/pokemon/dex_entries/marill.asm diff --git a/data/pokedex/entries/marowak.asm b/data/pokemon/dex_entries/marowak.asm similarity index 100% rename from data/pokedex/entries/marowak.asm rename to data/pokemon/dex_entries/marowak.asm diff --git a/data/pokedex/entries/meganium.asm b/data/pokemon/dex_entries/meganium.asm similarity index 100% rename from data/pokedex/entries/meganium.asm rename to data/pokemon/dex_entries/meganium.asm diff --git a/data/pokedex/entries/meowth.asm b/data/pokemon/dex_entries/meowth.asm similarity index 100% rename from data/pokedex/entries/meowth.asm rename to data/pokemon/dex_entries/meowth.asm diff --git a/data/pokedex/entries/metapod.asm b/data/pokemon/dex_entries/metapod.asm similarity index 100% rename from data/pokedex/entries/metapod.asm rename to data/pokemon/dex_entries/metapod.asm diff --git a/data/pokedex/entries/mew.asm b/data/pokemon/dex_entries/mew.asm similarity index 100% rename from data/pokedex/entries/mew.asm rename to data/pokemon/dex_entries/mew.asm diff --git a/data/pokedex/entries/mewtwo.asm b/data/pokemon/dex_entries/mewtwo.asm similarity index 100% rename from data/pokedex/entries/mewtwo.asm rename to data/pokemon/dex_entries/mewtwo.asm diff --git a/data/pokedex/entries/miltank.asm b/data/pokemon/dex_entries/miltank.asm similarity index 100% rename from data/pokedex/entries/miltank.asm rename to data/pokemon/dex_entries/miltank.asm diff --git a/data/pokedex/entries/misdreavus.asm b/data/pokemon/dex_entries/misdreavus.asm similarity index 100% rename from data/pokedex/entries/misdreavus.asm rename to data/pokemon/dex_entries/misdreavus.asm diff --git a/data/pokedex/entries/moltres.asm b/data/pokemon/dex_entries/moltres.asm similarity index 100% rename from data/pokedex/entries/moltres.asm rename to data/pokemon/dex_entries/moltres.asm diff --git a/data/pokedex/entries/mr__mime.asm b/data/pokemon/dex_entries/mr__mime.asm similarity index 100% rename from data/pokedex/entries/mr__mime.asm rename to data/pokemon/dex_entries/mr__mime.asm diff --git a/data/pokedex/entries/muk.asm b/data/pokemon/dex_entries/muk.asm similarity index 100% rename from data/pokedex/entries/muk.asm rename to data/pokemon/dex_entries/muk.asm diff --git a/data/pokedex/entries/murkrow.asm b/data/pokemon/dex_entries/murkrow.asm similarity index 100% rename from data/pokedex/entries/murkrow.asm rename to data/pokemon/dex_entries/murkrow.asm diff --git a/data/pokedex/entries/natu.asm b/data/pokemon/dex_entries/natu.asm similarity index 100% rename from data/pokedex/entries/natu.asm rename to data/pokemon/dex_entries/natu.asm diff --git a/data/pokedex/entries/nidoking.asm b/data/pokemon/dex_entries/nidoking.asm similarity index 100% rename from data/pokedex/entries/nidoking.asm rename to data/pokemon/dex_entries/nidoking.asm diff --git a/data/pokedex/entries/nidoqueen.asm b/data/pokemon/dex_entries/nidoqueen.asm similarity index 100% rename from data/pokedex/entries/nidoqueen.asm rename to data/pokemon/dex_entries/nidoqueen.asm diff --git a/data/pokedex/entries/nidoran_f.asm b/data/pokemon/dex_entries/nidoran_f.asm similarity index 100% rename from data/pokedex/entries/nidoran_f.asm rename to data/pokemon/dex_entries/nidoran_f.asm diff --git a/data/pokedex/entries/nidoran_m.asm b/data/pokemon/dex_entries/nidoran_m.asm similarity index 100% rename from data/pokedex/entries/nidoran_m.asm rename to data/pokemon/dex_entries/nidoran_m.asm diff --git a/data/pokedex/entries/nidorina.asm b/data/pokemon/dex_entries/nidorina.asm similarity index 100% rename from data/pokedex/entries/nidorina.asm rename to data/pokemon/dex_entries/nidorina.asm diff --git a/data/pokedex/entries/nidorino.asm b/data/pokemon/dex_entries/nidorino.asm similarity index 100% rename from data/pokedex/entries/nidorino.asm rename to data/pokemon/dex_entries/nidorino.asm diff --git a/data/pokedex/entries/ninetales.asm b/data/pokemon/dex_entries/ninetales.asm similarity index 100% rename from data/pokedex/entries/ninetales.asm rename to data/pokemon/dex_entries/ninetales.asm diff --git a/data/pokedex/entries/noctowl.asm b/data/pokemon/dex_entries/noctowl.asm similarity index 100% rename from data/pokedex/entries/noctowl.asm rename to data/pokemon/dex_entries/noctowl.asm diff --git a/data/pokedex/entries/octillery.asm b/data/pokemon/dex_entries/octillery.asm similarity index 100% rename from data/pokedex/entries/octillery.asm rename to data/pokemon/dex_entries/octillery.asm diff --git a/data/pokedex/entries/oddish.asm b/data/pokemon/dex_entries/oddish.asm similarity index 100% rename from data/pokedex/entries/oddish.asm rename to data/pokemon/dex_entries/oddish.asm diff --git a/data/pokedex/entries/omanyte.asm b/data/pokemon/dex_entries/omanyte.asm similarity index 100% rename from data/pokedex/entries/omanyte.asm rename to data/pokemon/dex_entries/omanyte.asm diff --git a/data/pokedex/entries/omastar.asm b/data/pokemon/dex_entries/omastar.asm similarity index 100% rename from data/pokedex/entries/omastar.asm rename to data/pokemon/dex_entries/omastar.asm diff --git a/data/pokedex/entries/onix.asm b/data/pokemon/dex_entries/onix.asm similarity index 100% rename from data/pokedex/entries/onix.asm rename to data/pokemon/dex_entries/onix.asm diff --git a/data/pokedex/entries/paras.asm b/data/pokemon/dex_entries/paras.asm similarity index 100% rename from data/pokedex/entries/paras.asm rename to data/pokemon/dex_entries/paras.asm diff --git a/data/pokedex/entries/parasect.asm b/data/pokemon/dex_entries/parasect.asm similarity index 100% rename from data/pokedex/entries/parasect.asm rename to data/pokemon/dex_entries/parasect.asm diff --git a/data/pokedex/entries/persian.asm b/data/pokemon/dex_entries/persian.asm similarity index 100% rename from data/pokedex/entries/persian.asm rename to data/pokemon/dex_entries/persian.asm diff --git a/data/pokedex/entries/phanpy.asm b/data/pokemon/dex_entries/phanpy.asm similarity index 100% rename from data/pokedex/entries/phanpy.asm rename to data/pokemon/dex_entries/phanpy.asm diff --git a/data/pokedex/entries/pichu.asm b/data/pokemon/dex_entries/pichu.asm similarity index 100% rename from data/pokedex/entries/pichu.asm rename to data/pokemon/dex_entries/pichu.asm diff --git a/data/pokedex/entries/pidgeot.asm b/data/pokemon/dex_entries/pidgeot.asm similarity index 100% rename from data/pokedex/entries/pidgeot.asm rename to data/pokemon/dex_entries/pidgeot.asm diff --git a/data/pokedex/entries/pidgeotto.asm b/data/pokemon/dex_entries/pidgeotto.asm similarity index 100% rename from data/pokedex/entries/pidgeotto.asm rename to data/pokemon/dex_entries/pidgeotto.asm diff --git a/data/pokedex/entries/pidgey.asm b/data/pokemon/dex_entries/pidgey.asm similarity index 100% rename from data/pokedex/entries/pidgey.asm rename to data/pokemon/dex_entries/pidgey.asm diff --git a/data/pokedex/entries/pikachu.asm b/data/pokemon/dex_entries/pikachu.asm similarity index 100% rename from data/pokedex/entries/pikachu.asm rename to data/pokemon/dex_entries/pikachu.asm diff --git a/data/pokedex/entries/piloswine.asm b/data/pokemon/dex_entries/piloswine.asm similarity index 100% rename from data/pokedex/entries/piloswine.asm rename to data/pokemon/dex_entries/piloswine.asm diff --git a/data/pokedex/entries/pineco.asm b/data/pokemon/dex_entries/pineco.asm similarity index 100% rename from data/pokedex/entries/pineco.asm rename to data/pokemon/dex_entries/pineco.asm diff --git a/data/pokedex/entries/pinsir.asm b/data/pokemon/dex_entries/pinsir.asm similarity index 100% rename from data/pokedex/entries/pinsir.asm rename to data/pokemon/dex_entries/pinsir.asm diff --git a/data/pokedex/entries/politoed.asm b/data/pokemon/dex_entries/politoed.asm similarity index 100% rename from data/pokedex/entries/politoed.asm rename to data/pokemon/dex_entries/politoed.asm diff --git a/data/pokedex/entries/poliwag.asm b/data/pokemon/dex_entries/poliwag.asm similarity index 100% rename from data/pokedex/entries/poliwag.asm rename to data/pokemon/dex_entries/poliwag.asm diff --git a/data/pokedex/entries/poliwhirl.asm b/data/pokemon/dex_entries/poliwhirl.asm similarity index 100% rename from data/pokedex/entries/poliwhirl.asm rename to data/pokemon/dex_entries/poliwhirl.asm diff --git a/data/pokedex/entries/poliwrath.asm b/data/pokemon/dex_entries/poliwrath.asm similarity index 100% rename from data/pokedex/entries/poliwrath.asm rename to data/pokemon/dex_entries/poliwrath.asm diff --git a/data/pokedex/entries/ponyta.asm b/data/pokemon/dex_entries/ponyta.asm similarity index 100% rename from data/pokedex/entries/ponyta.asm rename to data/pokemon/dex_entries/ponyta.asm diff --git a/data/pokedex/entries/porygon.asm b/data/pokemon/dex_entries/porygon.asm similarity index 100% rename from data/pokedex/entries/porygon.asm rename to data/pokemon/dex_entries/porygon.asm diff --git a/data/pokedex/entries/porygon2.asm b/data/pokemon/dex_entries/porygon2.asm similarity index 100% rename from data/pokedex/entries/porygon2.asm rename to data/pokemon/dex_entries/porygon2.asm diff --git a/data/pokedex/entries/primeape.asm b/data/pokemon/dex_entries/primeape.asm similarity index 100% rename from data/pokedex/entries/primeape.asm rename to data/pokemon/dex_entries/primeape.asm diff --git a/data/pokedex/entries/psyduck.asm b/data/pokemon/dex_entries/psyduck.asm similarity index 100% rename from data/pokedex/entries/psyduck.asm rename to data/pokemon/dex_entries/psyduck.asm diff --git a/data/pokedex/entries/pupitar.asm b/data/pokemon/dex_entries/pupitar.asm similarity index 100% rename from data/pokedex/entries/pupitar.asm rename to data/pokemon/dex_entries/pupitar.asm diff --git a/data/pokedex/entries/quagsire.asm b/data/pokemon/dex_entries/quagsire.asm similarity index 100% rename from data/pokedex/entries/quagsire.asm rename to data/pokemon/dex_entries/quagsire.asm diff --git a/data/pokedex/entries/quilava.asm b/data/pokemon/dex_entries/quilava.asm similarity index 100% rename from data/pokedex/entries/quilava.asm rename to data/pokemon/dex_entries/quilava.asm diff --git a/data/pokedex/entries/qwilfish.asm b/data/pokemon/dex_entries/qwilfish.asm similarity index 100% rename from data/pokedex/entries/qwilfish.asm rename to data/pokemon/dex_entries/qwilfish.asm diff --git a/data/pokedex/entries/raichu.asm b/data/pokemon/dex_entries/raichu.asm similarity index 100% rename from data/pokedex/entries/raichu.asm rename to data/pokemon/dex_entries/raichu.asm diff --git a/data/pokedex/entries/raikou.asm b/data/pokemon/dex_entries/raikou.asm similarity index 100% rename from data/pokedex/entries/raikou.asm rename to data/pokemon/dex_entries/raikou.asm diff --git a/data/pokedex/entries/rapidash.asm b/data/pokemon/dex_entries/rapidash.asm similarity index 100% rename from data/pokedex/entries/rapidash.asm rename to data/pokemon/dex_entries/rapidash.asm diff --git a/data/pokedex/entries/raticate.asm b/data/pokemon/dex_entries/raticate.asm similarity index 100% rename from data/pokedex/entries/raticate.asm rename to data/pokemon/dex_entries/raticate.asm diff --git a/data/pokedex/entries/rattata.asm b/data/pokemon/dex_entries/rattata.asm similarity index 100% rename from data/pokedex/entries/rattata.asm rename to data/pokemon/dex_entries/rattata.asm diff --git a/data/pokedex/entries/remoraid.asm b/data/pokemon/dex_entries/remoraid.asm similarity index 100% rename from data/pokedex/entries/remoraid.asm rename to data/pokemon/dex_entries/remoraid.asm diff --git a/data/pokedex/entries/rhydon.asm b/data/pokemon/dex_entries/rhydon.asm similarity index 100% rename from data/pokedex/entries/rhydon.asm rename to data/pokemon/dex_entries/rhydon.asm diff --git a/data/pokedex/entries/rhyhorn.asm b/data/pokemon/dex_entries/rhyhorn.asm similarity index 100% rename from data/pokedex/entries/rhyhorn.asm rename to data/pokemon/dex_entries/rhyhorn.asm diff --git a/data/pokedex/entries/sandshrew.asm b/data/pokemon/dex_entries/sandshrew.asm similarity index 100% rename from data/pokedex/entries/sandshrew.asm rename to data/pokemon/dex_entries/sandshrew.asm diff --git a/data/pokedex/entries/sandslash.asm b/data/pokemon/dex_entries/sandslash.asm similarity index 100% rename from data/pokedex/entries/sandslash.asm rename to data/pokemon/dex_entries/sandslash.asm diff --git a/data/pokedex/entries/scizor.asm b/data/pokemon/dex_entries/scizor.asm similarity index 100% rename from data/pokedex/entries/scizor.asm rename to data/pokemon/dex_entries/scizor.asm diff --git a/data/pokedex/entries/scyther.asm b/data/pokemon/dex_entries/scyther.asm similarity index 100% rename from data/pokedex/entries/scyther.asm rename to data/pokemon/dex_entries/scyther.asm diff --git a/data/pokedex/entries/seadra.asm b/data/pokemon/dex_entries/seadra.asm similarity index 100% rename from data/pokedex/entries/seadra.asm rename to data/pokemon/dex_entries/seadra.asm diff --git a/data/pokedex/entries/seaking.asm b/data/pokemon/dex_entries/seaking.asm similarity index 100% rename from data/pokedex/entries/seaking.asm rename to data/pokemon/dex_entries/seaking.asm diff --git a/data/pokedex/entries/seel.asm b/data/pokemon/dex_entries/seel.asm similarity index 100% rename from data/pokedex/entries/seel.asm rename to data/pokemon/dex_entries/seel.asm diff --git a/data/pokedex/entries/sentret.asm b/data/pokemon/dex_entries/sentret.asm similarity index 100% rename from data/pokedex/entries/sentret.asm rename to data/pokemon/dex_entries/sentret.asm diff --git a/data/pokedex/entries/shellder.asm b/data/pokemon/dex_entries/shellder.asm similarity index 100% rename from data/pokedex/entries/shellder.asm rename to data/pokemon/dex_entries/shellder.asm diff --git a/data/pokedex/entries/shuckle.asm b/data/pokemon/dex_entries/shuckle.asm similarity index 100% rename from data/pokedex/entries/shuckle.asm rename to data/pokemon/dex_entries/shuckle.asm diff --git a/data/pokedex/entries/skarmory.asm b/data/pokemon/dex_entries/skarmory.asm similarity index 100% rename from data/pokedex/entries/skarmory.asm rename to data/pokemon/dex_entries/skarmory.asm diff --git a/data/pokedex/entries/skiploom.asm b/data/pokemon/dex_entries/skiploom.asm similarity index 100% rename from data/pokedex/entries/skiploom.asm rename to data/pokemon/dex_entries/skiploom.asm diff --git a/data/pokedex/entries/slowbro.asm b/data/pokemon/dex_entries/slowbro.asm similarity index 100% rename from data/pokedex/entries/slowbro.asm rename to data/pokemon/dex_entries/slowbro.asm diff --git a/data/pokedex/entries/slowking.asm b/data/pokemon/dex_entries/slowking.asm similarity index 100% rename from data/pokedex/entries/slowking.asm rename to data/pokemon/dex_entries/slowking.asm diff --git a/data/pokedex/entries/slowpoke.asm b/data/pokemon/dex_entries/slowpoke.asm similarity index 100% rename from data/pokedex/entries/slowpoke.asm rename to data/pokemon/dex_entries/slowpoke.asm diff --git a/data/pokedex/entries/slugma.asm b/data/pokemon/dex_entries/slugma.asm similarity index 100% rename from data/pokedex/entries/slugma.asm rename to data/pokemon/dex_entries/slugma.asm diff --git a/data/pokedex/entries/smeargle.asm b/data/pokemon/dex_entries/smeargle.asm similarity index 100% rename from data/pokedex/entries/smeargle.asm rename to data/pokemon/dex_entries/smeargle.asm diff --git a/data/pokedex/entries/smoochum.asm b/data/pokemon/dex_entries/smoochum.asm similarity index 100% rename from data/pokedex/entries/smoochum.asm rename to data/pokemon/dex_entries/smoochum.asm diff --git a/data/pokedex/entries/sneasel.asm b/data/pokemon/dex_entries/sneasel.asm similarity index 100% rename from data/pokedex/entries/sneasel.asm rename to data/pokemon/dex_entries/sneasel.asm diff --git a/data/pokedex/entries/snorlax.asm b/data/pokemon/dex_entries/snorlax.asm similarity index 100% rename from data/pokedex/entries/snorlax.asm rename to data/pokemon/dex_entries/snorlax.asm diff --git a/data/pokedex/entries/snubbull.asm b/data/pokemon/dex_entries/snubbull.asm similarity index 100% rename from data/pokedex/entries/snubbull.asm rename to data/pokemon/dex_entries/snubbull.asm diff --git a/data/pokedex/entries/spearow.asm b/data/pokemon/dex_entries/spearow.asm similarity index 100% rename from data/pokedex/entries/spearow.asm rename to data/pokemon/dex_entries/spearow.asm diff --git a/data/pokedex/entries/spinarak.asm b/data/pokemon/dex_entries/spinarak.asm similarity index 100% rename from data/pokedex/entries/spinarak.asm rename to data/pokemon/dex_entries/spinarak.asm diff --git a/data/pokedex/entries/squirtle.asm b/data/pokemon/dex_entries/squirtle.asm similarity index 100% rename from data/pokedex/entries/squirtle.asm rename to data/pokemon/dex_entries/squirtle.asm diff --git a/data/pokedex/entries/stantler.asm b/data/pokemon/dex_entries/stantler.asm similarity index 100% rename from data/pokedex/entries/stantler.asm rename to data/pokemon/dex_entries/stantler.asm diff --git a/data/pokedex/entries/starmie.asm b/data/pokemon/dex_entries/starmie.asm similarity index 100% rename from data/pokedex/entries/starmie.asm rename to data/pokemon/dex_entries/starmie.asm diff --git a/data/pokedex/entries/staryu.asm b/data/pokemon/dex_entries/staryu.asm similarity index 100% rename from data/pokedex/entries/staryu.asm rename to data/pokemon/dex_entries/staryu.asm diff --git a/data/pokedex/entries/steelix.asm b/data/pokemon/dex_entries/steelix.asm similarity index 100% rename from data/pokedex/entries/steelix.asm rename to data/pokemon/dex_entries/steelix.asm diff --git a/data/pokedex/entries/sudowoodo.asm b/data/pokemon/dex_entries/sudowoodo.asm similarity index 100% rename from data/pokedex/entries/sudowoodo.asm rename to data/pokemon/dex_entries/sudowoodo.asm diff --git a/data/pokedex/entries/suicune.asm b/data/pokemon/dex_entries/suicune.asm similarity index 100% rename from data/pokedex/entries/suicune.asm rename to data/pokemon/dex_entries/suicune.asm diff --git a/data/pokedex/entries/sunflora.asm b/data/pokemon/dex_entries/sunflora.asm similarity index 100% rename from data/pokedex/entries/sunflora.asm rename to data/pokemon/dex_entries/sunflora.asm diff --git a/data/pokedex/entries/sunkern.asm b/data/pokemon/dex_entries/sunkern.asm similarity index 100% rename from data/pokedex/entries/sunkern.asm rename to data/pokemon/dex_entries/sunkern.asm diff --git a/data/pokedex/entries/swinub.asm b/data/pokemon/dex_entries/swinub.asm similarity index 100% rename from data/pokedex/entries/swinub.asm rename to data/pokemon/dex_entries/swinub.asm diff --git a/data/pokedex/entries/tangela.asm b/data/pokemon/dex_entries/tangela.asm similarity index 100% rename from data/pokedex/entries/tangela.asm rename to data/pokemon/dex_entries/tangela.asm diff --git a/data/pokedex/entries/tauros.asm b/data/pokemon/dex_entries/tauros.asm similarity index 100% rename from data/pokedex/entries/tauros.asm rename to data/pokemon/dex_entries/tauros.asm diff --git a/data/pokedex/entries/teddiursa.asm b/data/pokemon/dex_entries/teddiursa.asm similarity index 100% rename from data/pokedex/entries/teddiursa.asm rename to data/pokemon/dex_entries/teddiursa.asm diff --git a/data/pokedex/entries/tentacool.asm b/data/pokemon/dex_entries/tentacool.asm similarity index 100% rename from data/pokedex/entries/tentacool.asm rename to data/pokemon/dex_entries/tentacool.asm diff --git a/data/pokedex/entries/tentacruel.asm b/data/pokemon/dex_entries/tentacruel.asm similarity index 100% rename from data/pokedex/entries/tentacruel.asm rename to data/pokemon/dex_entries/tentacruel.asm diff --git a/data/pokedex/entries/togepi.asm b/data/pokemon/dex_entries/togepi.asm similarity index 100% rename from data/pokedex/entries/togepi.asm rename to data/pokemon/dex_entries/togepi.asm diff --git a/data/pokedex/entries/togetic.asm b/data/pokemon/dex_entries/togetic.asm similarity index 100% rename from data/pokedex/entries/togetic.asm rename to data/pokemon/dex_entries/togetic.asm diff --git a/data/pokedex/entries/totodile.asm b/data/pokemon/dex_entries/totodile.asm similarity index 100% rename from data/pokedex/entries/totodile.asm rename to data/pokemon/dex_entries/totodile.asm diff --git a/data/pokedex/entries/typhlosion.asm b/data/pokemon/dex_entries/typhlosion.asm similarity index 100% rename from data/pokedex/entries/typhlosion.asm rename to data/pokemon/dex_entries/typhlosion.asm diff --git a/data/pokedex/entries/tyranitar.asm b/data/pokemon/dex_entries/tyranitar.asm similarity index 100% rename from data/pokedex/entries/tyranitar.asm rename to data/pokemon/dex_entries/tyranitar.asm diff --git a/data/pokedex/entries/tyrogue.asm b/data/pokemon/dex_entries/tyrogue.asm similarity index 100% rename from data/pokedex/entries/tyrogue.asm rename to data/pokemon/dex_entries/tyrogue.asm diff --git a/data/pokedex/entries/umbreon.asm b/data/pokemon/dex_entries/umbreon.asm similarity index 100% rename from data/pokedex/entries/umbreon.asm rename to data/pokemon/dex_entries/umbreon.asm diff --git a/data/pokedex/entries/unown.asm b/data/pokemon/dex_entries/unown.asm similarity index 100% rename from data/pokedex/entries/unown.asm rename to data/pokemon/dex_entries/unown.asm diff --git a/data/pokedex/entries/ursaring.asm b/data/pokemon/dex_entries/ursaring.asm similarity index 100% rename from data/pokedex/entries/ursaring.asm rename to data/pokemon/dex_entries/ursaring.asm diff --git a/data/pokedex/entries/vaporeon.asm b/data/pokemon/dex_entries/vaporeon.asm similarity index 100% rename from data/pokedex/entries/vaporeon.asm rename to data/pokemon/dex_entries/vaporeon.asm diff --git a/data/pokedex/entries/venomoth.asm b/data/pokemon/dex_entries/venomoth.asm similarity index 100% rename from data/pokedex/entries/venomoth.asm rename to data/pokemon/dex_entries/venomoth.asm diff --git a/data/pokedex/entries/venonat.asm b/data/pokemon/dex_entries/venonat.asm similarity index 100% rename from data/pokedex/entries/venonat.asm rename to data/pokemon/dex_entries/venonat.asm diff --git a/data/pokedex/entries/venusaur.asm b/data/pokemon/dex_entries/venusaur.asm similarity index 100% rename from data/pokedex/entries/venusaur.asm rename to data/pokemon/dex_entries/venusaur.asm diff --git a/data/pokedex/entries/victreebel.asm b/data/pokemon/dex_entries/victreebel.asm similarity index 100% rename from data/pokedex/entries/victreebel.asm rename to data/pokemon/dex_entries/victreebel.asm diff --git a/data/pokedex/entries/vileplume.asm b/data/pokemon/dex_entries/vileplume.asm similarity index 100% rename from data/pokedex/entries/vileplume.asm rename to data/pokemon/dex_entries/vileplume.asm diff --git a/data/pokedex/entries/voltorb.asm b/data/pokemon/dex_entries/voltorb.asm similarity index 100% rename from data/pokedex/entries/voltorb.asm rename to data/pokemon/dex_entries/voltorb.asm diff --git a/data/pokedex/entries/vulpix.asm b/data/pokemon/dex_entries/vulpix.asm similarity index 100% rename from data/pokedex/entries/vulpix.asm rename to data/pokemon/dex_entries/vulpix.asm diff --git a/data/pokedex/entries/wartortle.asm b/data/pokemon/dex_entries/wartortle.asm similarity index 100% rename from data/pokedex/entries/wartortle.asm rename to data/pokemon/dex_entries/wartortle.asm diff --git a/data/pokedex/entries/weedle.asm b/data/pokemon/dex_entries/weedle.asm similarity index 100% rename from data/pokedex/entries/weedle.asm rename to data/pokemon/dex_entries/weedle.asm diff --git a/data/pokedex/entries/weepinbell.asm b/data/pokemon/dex_entries/weepinbell.asm similarity index 100% rename from data/pokedex/entries/weepinbell.asm rename to data/pokemon/dex_entries/weepinbell.asm diff --git a/data/pokedex/entries/weezing.asm b/data/pokemon/dex_entries/weezing.asm similarity index 100% rename from data/pokedex/entries/weezing.asm rename to data/pokemon/dex_entries/weezing.asm diff --git a/data/pokedex/entries/wigglytuff.asm b/data/pokemon/dex_entries/wigglytuff.asm similarity index 100% rename from data/pokedex/entries/wigglytuff.asm rename to data/pokemon/dex_entries/wigglytuff.asm diff --git a/data/pokedex/entries/wobbuffet.asm b/data/pokemon/dex_entries/wobbuffet.asm similarity index 100% rename from data/pokedex/entries/wobbuffet.asm rename to data/pokemon/dex_entries/wobbuffet.asm diff --git a/data/pokedex/entries/wooper.asm b/data/pokemon/dex_entries/wooper.asm similarity index 100% rename from data/pokedex/entries/wooper.asm rename to data/pokemon/dex_entries/wooper.asm diff --git a/data/pokedex/entries/xatu.asm b/data/pokemon/dex_entries/xatu.asm similarity index 100% rename from data/pokedex/entries/xatu.asm rename to data/pokemon/dex_entries/xatu.asm diff --git a/data/pokedex/entries/yanma.asm b/data/pokemon/dex_entries/yanma.asm similarity index 100% rename from data/pokedex/entries/yanma.asm rename to data/pokemon/dex_entries/yanma.asm diff --git a/data/pokedex/entries/zapdos.asm b/data/pokemon/dex_entries/zapdos.asm similarity index 100% rename from data/pokedex/entries/zapdos.asm rename to data/pokemon/dex_entries/zapdos.asm diff --git a/data/pokedex/entries/zubat.asm b/data/pokemon/dex_entries/zubat.asm similarity index 100% rename from data/pokedex/entries/zubat.asm rename to data/pokemon/dex_entries/zubat.asm diff --git a/data/pokedex/entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm similarity index 100% rename from data/pokedex/entry_pointers.asm rename to data/pokemon/dex_entry_pointers.asm diff --git a/data/pokedex/order_alpha.asm b/data/pokemon/dex_order_alpha.asm similarity index 100% rename from data/pokedex/order_alpha.asm rename to data/pokemon/dex_order_alpha.asm diff --git a/data/pokedex/order_new.asm b/data/pokemon/dex_order_new.asm similarity index 100% rename from data/pokedex/order_new.asm rename to data/pokemon/dex_order_new.asm diff --git a/data/egg_move_pointers.asm b/data/pokemon/egg_move_pointers.asm similarity index 100% rename from data/egg_move_pointers.asm rename to data/pokemon/egg_move_pointers.asm diff --git a/data/egg_moves.asm b/data/pokemon/egg_moves.asm similarity index 99% rename from data/egg_moves.asm rename to data/pokemon/egg_moves.asm index 2fcf47232..c1f9ae964 100644 --- a/data/egg_moves.asm +++ b/data/pokemon/egg_moves.asm @@ -10,7 +10,7 @@ SECTION "Egg Moves", ROMX ; and can only breed with Ditto. -INCLUDE "data/egg_move_pointers.asm" +INCLUDE "data/pokemon/egg_move_pointers.asm" EggMoves:: diff --git a/data/evos_attacks.asm b/data/pokemon/evos_attacks.asm similarity index 99% rename from data/evos_attacks.asm rename to data/pokemon/evos_attacks.asm index 749731812..f21febf87 100644 --- a/data/evos_attacks.asm +++ b/data/pokemon/evos_attacks.asm @@ -4,7 +4,7 @@ INCLUDE "includes.asm" SECTION "Evolutions and Attacks", ROMX -INCLUDE "data/evos_attacks_pointers.asm" +INCLUDE "data/pokemon/evos_attacks_pointers.asm" EvosAttacks:: diff --git a/data/evos_attacks_pointers.asm b/data/pokemon/evos_attacks_pointers.asm similarity index 100% rename from data/evos_attacks_pointers.asm rename to data/pokemon/evos_attacks_pointers.asm diff --git a/data/mon_menu_icons.asm b/data/pokemon/menu_icons.asm similarity index 100% rename from data/mon_menu_icons.asm rename to data/pokemon/menu_icons.asm diff --git a/data/pokemon_names.asm b/data/pokemon/pokemon_names.asm similarity index 100% rename from data/pokemon_names.asm rename to data/pokemon/pokemon_names.asm diff --git a/data/sgb_border_map.asm b/data/sgb_border_map.asm new file mode 100644 index 000000000..d9efb8ead --- /dev/null +++ b/data/sgb_border_map.asm @@ -0,0 +1,29 @@ + + db $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $14, $14, $15, $14, $16, $14, $17, $14, $17, $54, $16, $54, $15, $54, $14, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14 + db $01, $14, $02, $14, $03, $14, $03, $54, $02, $54, $01, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $24, $14, $25, $14, $26, $14, $07, $14, $07, $54, $26, $54, $25, $54, $24, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $54, $01, $14, $02, $14, $03, $14, $03, $54, $02, $54, $01, $54 + db $11, $14, $12, $14, $13, $14, $13, $54, $12, $54, $11, $54, $10, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $24, $14, $34, $14, $35, $14, $35, $54, $34, $54, $33, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $10, $14, $11, $14, $12, $14, $13, $14, $13, $54, $12, $54, $11, $54 + db $21, $14, $22, $14, $23, $14, $23, $54, $22, $54, $21, $54, $20, $54, $07, $14, $08, $14, $09, $14, $0a, $14, $0b, $14, $0c, $14, $0d, $14, $07, $14, $07, $14, $18, $14, $09, $14, $1a, $14, $1b, $14, $0d, $14, $0c, $14, $1c, $14, $29, $14, $07, $14, $20, $14, $21, $14, $22, $14, $23, $14, $23, $54, $22, $54, $21, $54 + db $31, $14, $32, $14, $07, $14, $07, $14, $32, $54, $36, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $27, $10, $32, $14, $07, $54, $07, $54, $32, $54, $31, $54 + db $05, $14, $06, $14, $07, $14, $07, $54, $06, $54, $1f, $10, $37, $10, $06, $14, $07, $14, $07, $54, $06, $54, $05, $54 + db $15, $14, $16, $14, $17, $14, $17, $54, $16, $54, $1f, $10, $37, $10, $16, $14, $17, $14, $17, $54, $16, $54, $15, $54 + db $25, $14, $26, $14, $07, $14, $07, $54, $26, $54, $1f, $10, $37, $10, $26, $14, $07, $14, $07, $54, $26, $54, $25, $54 + db $33, $14, $34, $14, $35, $14, $35, $54, $34, $54, $1f, $10, $37, $10, $34, $14, $35, $14, $35, $54, $34, $54, $33, $54 + db $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14 + db $02, $54, $01, $54, $07, $54, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $07, $14, $01, $14, $02, $14 + db $12, $54, $11, $54, $10, $54, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $10, $14, $11, $14, $12, $14 + db $22, $54, $21, $54, $20, $54, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $20, $14, $21, $14, $22, $14 + db $32, $54, $31, $54, $30, $54, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $30, $14, $31, $14, $32, $14 + db $06, $54, $05, $54, $04, $54, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $04, $14, $05, $14, $06, $14 + db $16, $54, $15, $54, $14, $54, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $14, $14, $15, $14, $16, $14 + db $26, $54, $25, $54, $24, $54, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $24, $14, $25, $14, $26, $14 + db $34, $54, $33, $54, $07, $54, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $07, $14, $33, $14, $34, $14 + db $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14 + db $01, $14, $02, $14, $03, $14, $03, $54, $02, $54, $1f, $10, $37, $10, $02, $14, $03, $14, $03, $54, $02, $54, $01, $54 + db $11, $14, $12, $14, $13, $14, $13, $54, $12, $54, $1f, $10, $37, $10, $12, $14, $13, $14, $13, $54, $12, $54, $11, $54 + db $21, $14, $22, $14, $23, $14, $23, $54, $22, $54, $1f, $10, $37, $10, $22, $14, $23, $14, $23, $54, $22, $54, $21, $54 + db $31, $14, $32, $14, $07, $14, $07, $14, $32, $54, $1f, $10, $37, $10, $32, $14, $07, $54, $07, $54, $32, $54, $31, $54 + db $05, $14, $06, $14, $07, $14, $07, $54, $06, $54, $2e, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2d, $10, $06, $14, $07, $14, $07, $54, $06, $54, $05, $54 + db $15, $14, $16, $14, $17, $14, $17, $54, $16, $54, $15, $54, $14, $54, $07, $14, $07, $14, $39, $14, $0e, $14, $09, $14, $0f, $14, $28, $14, $07, $14, $19, $14, $0c, $14, $1c, $14, $29, $14, $2a, $14, $2b, $14, $2c, $14, $39, $14, $07, $14, $07, $14, $14, $14, $15, $14, $16, $14, $17, $14, $17, $54, $16, $54, $15, $54 + db $25, $14, $26, $14, $07, $14, $07, $54, $26, $54, $25, $54, $24, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $01, $14, $02, $14, $03, $14, $03, $54, $02, $54, $01, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $24, $14, $25, $14, $26, $14, $07, $14, $07, $54, $26, $54, $25, $54 + db $33, $14, $34, $14, $35, $14, $35, $54, $34, $54, $24, $54, $07, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $10, $14, $11, $14, $12, $14, $13, $14, $13, $54, $12, $54, $11, $54, $10, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $24, $14, $34, $14, $35, $14, $35, $54, $34, $54, $33, $54 + db $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $20, $14, $21, $14, $22, $14, $23, $14, $23, $54, $22, $54, $21, $54, $20, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14 diff --git a/data/text_buffers.asm b/data/text_buffers.asm new file mode 100644 index 000000000..5a03c8cc7 --- /dev/null +++ b/data/text_buffers.asm @@ -0,0 +1,9 @@ +StringBufferPointers:: ; 24000 +; entries correspond to arguments for text_buffer (TX_STRINGBUFFER) + dw StringBuffer3 ; 0 + dw StringBuffer4 ; 1 + dw StringBuffer5 ; 2 + dw StringBuffer2 ; 3 + dw StringBuffer1 ; 4 + dw EnemyMonNick ; 5 + dw BattleMonNick ; 6 diff --git a/trainers/encounter_music.asm b/data/trainers/encounter_music.asm similarity index 100% rename from trainers/encounter_music.asm rename to data/trainers/encounter_music.asm diff --git a/trainers/gendered_trainers.asm b/data/trainers/gendered_trainers.asm similarity index 100% rename from trainers/gendered_trainers.asm rename to data/trainers/gendered_trainers.asm diff --git a/trainers/trainers.asm b/data/trainers/parties.asm similarity index 100% rename from trainers/trainers.asm rename to data/trainers/parties.asm diff --git a/trainers/trainer_pointers.asm b/data/trainers/party_pointers.asm similarity index 100% rename from trainers/trainer_pointers.asm rename to data/trainers/party_pointers.asm diff --git a/trainers/attributes.asm b/data/trainers/trainer_attributes.asm similarity index 100% rename from trainers/attributes.asm rename to data/trainers/trainer_attributes.asm diff --git a/text/trainer_class_names.asm b/data/trainers/trainer_class_names.asm similarity index 90% rename from text/trainer_class_names.asm rename to data/trainers/trainer_class_names.asm index 555e6c652..48d81f910 100755 --- a/text/trainer_class_names.asm +++ b/data/trainers/trainer_class_names.asm @@ -1,3 +1,5 @@ +TrainerClassNames:: ; 2c1ef +; entries correspond to trainer classes (see constants/trainer_constants.asm) db "LEADER@" db "LEADER@" db "LEADER@" diff --git a/trainers/dvs.asm b/data/trainers/trainer_dvs.asm similarity index 100% rename from trainers/dvs.asm rename to data/trainers/trainer_dvs.asm diff --git a/engine/unowndex.asm b/data/unown_words.asm old mode 100755 new mode 100644 similarity index 70% rename from engine/unowndex.asm rename to data/unown_words.asm index 007dd9790..a36dea6d1 --- a/engine/unowndex.asm +++ b/data/unown_words.asm @@ -1,55 +1,14 @@ -UpdateUnownDex: ; fba18 - ld a, [UnownLetter] - ld c, a - ld b, NUM_UNOWN - ld hl, UnownDex -.loop - ld a, [hli] - and a - jr z, .done - cp c - ret z - dec b - jr nz, .loop - ret - -.done - dec hl - ld [hl], c - ret -; fba2e - - -PrintUnownWord: ; fba2e (3e:7a2e) - hlcoord 4, 15 - ld bc, 12 - ld a, " " - call ByteFill - ld a, [wDexCurrentUnownIndex] - ld e, a - ld d, 0 - ld hl, UnownDex - add hl, de - ld a, [hl] - ld e, a - ld d, 0 - ld hl, UnownWords - add hl, de - add hl, de - ld a, [hli] - ld e, a - ld d, [hl] - hlcoord 4, 15 -.loop - ld a, [de] - cp -1 - ret z - inc de - ld [hli], a - jr .loop -; fba5a (3e:7a5a) +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 @@ -79,16 +38,6 @@ UnownWords: ; fba5a dw UnownWord26 ; fba90 -unownword: macro -x = 1 - rept STRLEN(\1) - db STRSUB(\1, x, 1) - $40 -x = x + 1 - endr - db -1 -endm - - UnownWord1: unownword "ANGRY" UnownWord2: unownword "BEAR" UnownWord3: unownword "CHASE" diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 287b0324c..b38ec12ee 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -1,11 +1,62 @@ # Bugs and Glitches +## Contents + +- [Thick Club and Light Ball can decrease damage done with boosted (Special) Attack](#thick-club-and-light-ball-can-decrease-damage-done-with-boosted-special-attack) +- [Metal Powder can increase damage taken with boosted (Special) Defense](#metal-powder-can-increase-damage-taken-with-boosted-special-defense) +- [Belly Drum sharply boosts Attack even with under 50% HP](#belly-drum-sharply-boosts-attack-even-with-under-50-hp) +- [Moves that lower Defense can do so after breaking a Substitute](#moves-that-lower-defense-can-do-so-after-breaking-a-substitute) +- [Counter and Mirror Coat still work if the opponent uses an item](#counter-and-mirror-coat-still-work-if-the-opponent-uses-an-item) +- [A Disabled but PP Up–enhanced move may not trigger Struggle](#a-disabled-but-pp-upenhanced-move-may-not-trigger-struggle) +- [A Pokémon that fainted from Pursuit will have its old status condition when revived](#a-pokémon-that-fainted-from-pursuit-will-have-its-old-status-condition-when-revived) +- [Lock-On and Mind Reader don't always bypass Fly and Dig](#lock-on-and-mind-reader-dont-always-bypass-fly-and-dig) +- [Beat Up can desynchronize link battles](#beat-up-can-desynchronize-link-battles) +- [Present damage is incorrect in link battles](#present-damage-is-incorrect-in-link-battles) +- ["Smart" AI encourages Mean Look if its own Pokémon is badly poisoned](#smart-ai-encourages-mean-look-if-its-own-pokémon-is-badly-poisoned) +- [AI makes a false assumption about `CheckTypeMatchup`](#ai-makes-a-false-assumption-about-checktypematchup) +- [NPC use of Full Heal or Full Restore does not cure Nightmare status](#npc-use-of-full-heal-or-full-restore-does-not-cure-nightmare-status) +- [HP bar animation is slow for high HP](#hp-bar-animation-is-slow-for-high-hp) +- [HP bar animation off-by-one error for low HP](#hp-bar-animation-off-by-one-error-for-low-hp) +- [Experience underflow for level 1 Pokémon with Medium-Slow growth rate](#experience-underflow-for-level-1-pokémon-with-medium-slow-growth-rate) +- [Five-digit experience gain is printed incorrectly](#five-digit-experience-gain-is-printed-incorrectly) +- [BRN/PSN/PAR do not affect catch rate](#brnpsnpar-do-not-affect-catch-rate) +- [Moon Ball does not boost catch rate](#moon-ball-does-not-boost-catch-rate) +- [Love Ball boosts catch rate for the wrong gender](#love-ball-boosts-catch-rate-for-the-wrong-gender) +- [Fast Ball only boosts catch rate for three Pokémon](#fast-ball-only-boosts-catch-rate-for-three-pokémon) +- [Dragon Scale, not Dragon Fang, boosts Dragon-type moves](#dragon-scale-not-dragon-fang-boosts-dragon-type-moves) +- [Daisy's grooming doesn't always increase happiness](#daisys-grooming-doesnt-always-increase-happiness) +- [Magikarp in Lake of Rage are shorter, not longer](#magikarp-in-lake-of-rage-are-shorter-not-longer) +- [Magikarp lengths can be miscalculated](#magikarp-lengths-can-be-miscalculated) +- [Battle transitions fail to account for the enemy's level](#battle-transitions-fail-to-account-for-the-enemys-level) +- [Slot machine payout sound effects cut each other off](#slot-machine-payout-sound-effects-cut-each-other-off) +- [Team Rocket battle music is not used for Executives or Scientists](#team-rocket-battle-music-is-not-used-for-executives-or-scientists) +- [No bump noise if standing on tile `$3E`](#no-bump-noise-if-standing-on-tile-3e) +- [Playing Entei's Pokédex cry can distort Raikou's and Suicune's](#playing-enteis-pokédex-cry-can-distort-raikous-and-suicunes) +- [In-battle “`…`” ellipsis is too high](#in-battle--ellipsis-is-too-high) +- [Two tiles in the `port` tileset are drawn incorrectly](#two-tiles-in-the-port-tileset-are-drawn-incorrectly) +- [`LoadMetatiles` wraps around past 128 blocks](#loadmetatiles-wraps-around-past-128-blocks) +- [Surfing directly across a map connection does not load the new map](#surfing-directly-across-a-map-connection-does-not-load-the-new-map) +- [`Function6ec1` does not correctly limit object movement](#function6ec1-does-not-correctly-limit-object-movement) +- [`CheckOwnMon` only checks the first five letters of OT names](#checkownmon-only-checks-the-first-five-letters-of-ot-names) +- [Catching a Transformed Pokémon always catches a Ditto](#catching-a-transformed-pokémon-always-catches-a-ditto) +- [Using a Park Ball in normal battles has a corrupt animation](#using-a-park-ball-in-normal-battles-has-a-corrupt-animation) +- [`HELD_CATCH_CHANCE` has no effect](#held_catch_chance-has-no-effect) +- [Only the first three `EvosAttacks` evolution entries can have Stone compatibility reported correctly](#only-the-first-three-evosattacks-evolution-entries-can-have-stone-compatibility-reported-correctly) +- [`ScriptCall` can overflow `wScriptStack` and crash](#scriptcall-can-overflow-wscriptstack-and-crash) +- [`LoadSpriteGFX` does not limit the capacity of `UsedSprites`](#loadspritegfx-does-not-limit-the-capacity-of-usedsprites) +- [`ChooseWildEncounter` doesn't really validate the wild Pokémon species](#choosewildencounter-doesnt-really-validate-the-wild-pokémon-species) +- [`TryObjectEvent` arbitrary code execution](#tryobjectevent-arbitrary-code-execution) +- [`Special_CheckBugContestContestantFlag` can read beyond its data table](#special_checkbugcontestcontestantflag-can-read-beyond-its-data-table) +- [`ClearWRAM` only clears WRAM bank 1](#clearwram-only-clears-wram-bank-1) +- [`GetForestTreeFrame` works, but it's still bad](#getforesttreeframe-works-but-its-still-bad) + + ## Thick Club and Light Ball can decrease damage done with boosted (Special) Attack ([Video](https://www.youtube.com/watch?v=rGqu3d3pdok&t=450)) -This is a bug with `SpeciesItemBoost` in [battle/effect_commands.asm](battle/effect_commands.asm): +This is a bug with `SpeciesItemBoost` in [battle/effect_commands.asm](/battle/effect_commands.asm): ```asm ; Double the stat @@ -39,7 +90,7 @@ This is a bug with `SpeciesItemBoost` in [battle/effect_commands.asm](battle/eff ([Video](https://www.youtube.com/watch?v=rGqu3d3pdok&t=450)) -This is a bug with `DittoMetalPowder` in [battle/effect_commands.asm](battle/effect_commands.asm): +This is a bug with `DittoMetalPowder` in [battle/effect_commands.asm](/battle/effect_commands.asm): ```asm ld a, c @@ -95,7 +146,7 @@ This is a bug with `DittoMetalPowder` in [battle/effect_commands.asm](battle/eff ([Video](https://www.youtube.com/watch?v=zuCLMikWo4Y)) -This is a bug with `BattleCommand_BellyDrum` in [battle/effect_commands.asm](battle/effect_commands.asm): +This is a bug with `BattleCommand_BellyDrum` in [battle/effect_commands.asm](/battle/effect_commands.asm): ```asm BattleCommand_BellyDrum: ; 37c1a @@ -129,11 +180,256 @@ BattleCommand_BellyDrum: ; 37c1a ``` +## Moves that lower Defense can do so after breaking a Substitute + +([Video](https://www.youtube.com/watch?v=OGwKPRJLaaI)) + +This bug affects Acid, Iron Tail, and Rock Smash. + +This is a bug with `DefenseDownHit` in [battle/moves/move_effects.asm](/battle/moves/move_effects.asm): + +```asm +DefenseDownHit: + checkobedience + usedmovetext + doturn + critical + damagestats + damagecalc + stab + damagevariation + checkhit + effectchance + hittarget + failuretext + checkfaint + criticaltext + supereffectivetext + checkdestinybond + buildopponentrage + effectchance ; bug: duplicate effectchance shouldn't be here + defensedown + statdownmessage + endmove +``` + +**Fix:** Delete the second `effectchance`. + + +## Counter and Mirror Coat still work if the opponent uses an item + +([Video](https://www.youtube.com/watch?v=uRYyzKRatFk)) + +*To do:* Identify specific code causing this bug and fix it. + + +## A Disabled but PP Up–enhanced move may not trigger Struggle + +([Video](https://www.youtube.com/watch?v=1v9x4SgMggs)) + +This is a bug with `CheckPlayerHasUsableMoves` in [battle/core.asm](/battle/core.asm): + +```asm +.done + ; Bug: this will result in a move with PP Up confusing the game. + ; Replace with "and $3f" to fix. + and a + ret nz + +.force_struggle + ld hl, BattleText_PkmnHasNoMovesLeft + call StdBattleTextBox + ld c, 60 + call DelayFrames + xor a + ret +``` + +**Fix:** Change `and a` to `and $3f`. + + +## A Pokémon that fainted from Pursuit will have its old status condition when revived + +([Video](https://www.youtube.com/watch?v=tiRvw-Nb2ME)) + +*To do:* Identify specific code causing this bug and fix it. + + +## Lock-On and Mind Reader don't always bypass Fly and Dig + +This bug affects Attract, Curse, Foresight, Mean Look, Mimic, Nightmare, Spider Web, Transform, and stat-lowering effects of moves like String Shot or Bubble during the semi-invulnerable turn of Fly or Dig. + +This is a bug with `CheckHiddenOpponent` in [battle/effect_commands.asm](/battle/effect_commands.asm): + +```asm +CheckHiddenOpponent: ; 37daa +; BUG: This routine should account for Lock-On and Mind Reader. + ld a, BATTLE_VARS_SUBSTATUS3_OPP + call GetBattleVar + and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND + ret +``` + +*To do:* Fix this bug. + + +## Beat Up can desynchronize link battles + +([Video](https://www.youtube.com/watch?v=202-iAsrIa8)) + +This is a bug with `BattleCommand_BeatUp` in [battle/effect_commands.asm](/battle/effect_commands.asm): + +```asm +.got_mon + ld a, [wd002] + ld hl, PartyMonNicknames + call GetNick + ld a, MON_HP + call GetBeatupMonLocation + ld a, [hli] + or [hl] + jp z, .beatup_fail ; fainted + ld a, [wd002] + ld c, a + ld a, [CurBattleMon] + ; BUG: this can desynchronize link battles + ; Change "cp [hl]" to "cp c" to fix + cp [hl] + ld hl, BattleMonStatus + jr z, .active_mon + ld a, MON_STATUS + call GetBeatupMonLocation +.active_mon + ld a, [hl] + and a + jp nz, .beatup_fail +``` + +**Fix:** Change `cp [hl]` to `cp c`. + + +## Present damage is incorrect in link battles + +([Video](https://www.youtube.com/watch?v=XJaQoKtrEuw)) + +This bug existed for all battles in Gold and Silver, and was only fixed for single-player battles in Crystal to preserve link compatibility. + +This is a bug with `BattleCommand_Present` in [battle/effects/present.asm](/battle/effects/present.asm): + +```asm +BattleCommand_Present: ; 37874 +; present + + ld a, [wLinkMode] + cp LINK_COLOSSEUM + jr z, .colosseum_skippush + push bc + push de +.colosseum_skippush + + call BattleCommand_Stab + + ld a, [wLinkMode] + cp LINK_COLOSSEUM + jr z, .colosseum_skippop + pop de + pop bc +.colosseum_skippop +``` + +**Fix:** + +```asm +BattleCommand_Present: ; 37874 +; present + + push bc + push de + call BattleCommand_Stab + pop de + pop bc +``` + + +## "Smart" AI encourages Mean Look if its own Pokémon is badly poisoned + +([Video](https://www.youtube.com/watch?v=cygMO-zHTls)) + +This is a bug with `AI_Smart_MeanLook` in [battle/ai/scoring.asm](/battle/ai/scoring.asm): + +```asm +; 80% chance to greatly encourage this move if the enemy is badly poisoned (buggy). +; Should check PlayerSubStatus5 instead. + ld a, [EnemySubStatus5] + bit SUBSTATUS_TOXIC, a + jr nz, .asm_38e26 +``` + +**Fix:** Change `EnemySubStatus5` to `PlayerSubStatus5`. + + +## AI makes a false assumption about `CheckTypeMatchup` + +In [battle/effect_commands.asm](/battle/effect_commands.asm): + +```asm +BattleCheckTypeMatchup: ; 347c8 + ld hl, EnemyMonType1 + ld a, [hBattleTurn] + and a + jr z, CheckTypeMatchup + ld hl, BattleMonType1 +CheckTypeMatchup: ; 347d3 +; There is an incorrect assumption about this function made in the AI related code: when +; the AI calls CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing the +; offensive type in a will make this function do the right thing. Since a is overwritten, +; this assumption is incorrect. A simple fix would be to load the move type for the +; current move into a in BattleCheckTypeMatchup, before falling through, which is +; consistent with how the rest of the code assumes this code works like. + push hl + push de + push bc + ld a, BATTLE_VARS_MOVE_TYPE + call GetBattleVar + ld d, a +``` + +*To do:* Fix this bug. + + +## NPC use of Full Heal or Full Restore does not cure Nightmare status + +([Video](https://www.youtube.com/watch?v=rGqu3d3pdok&t=322)) + +This is a bug with `AI_HealStatus` in [battle/ai/items.asm](/battle/ai/items.asm): + +```asm +AI_HealStatus: ; 384e0 + ld a, [CurOTMon] + ld hl, OTPartyMon1Status + ld bc, PARTYMON_STRUCT_LENGTH + call AddNTimes + xor a + ld [hl], a + ld [EnemyMonStatus], a + ; Bug: this should reset SUBSTATUS_NIGHTMARE too + ; Uncomment the lines below to fix + ; ld hl, EnemySubStatus1 + ; res SUBSTATUS_NIGHTMARE, [hl] + ld hl, EnemySubStatus5 + res SUBSTATUS_TOXIC, [hl] + ret +; 384f7 +``` + +**Fix:** Uncomment `ld hl, EnemySubStatus1` and `res SUBSTATUS_NIGHTMARE, [hl]`. + + ## HP bar animation is slow for high HP ([Video](https://www.youtube.com/watch?v=SE-BfsFgZVM)) -This is a bug with `LongAnim_UpdateVariables` in [engine/anim_hp_bar.asm](engine/anim_hp_bar.asm): +This is a bug with `LongAnim_UpdateVariables` in [engine/anim_hp_bar.asm](/engine/anim_hp_bar.asm): ```asm ; This routine is buggy. The result from ComputeHPBarPixels is stored @@ -161,7 +457,7 @@ This is a bug with `LongAnim_UpdateVariables` in [engine/anim_hp_bar.asm](engine ([Video](https://www.youtube.com/watch?v=9KyNVIZxJvI)) -This is a bug with `ShortHPBar_CalcPixelFrame` in [engine/anim_hp_bar.asm](engine/anim_hp_bar.asm): +This is a bug with `ShortHPBar_CalcPixelFrame` in [engine/anim_hp_bar.asm](/engine/anim_hp_bar.asm): ```asm ld b, 0 @@ -189,7 +485,7 @@ This is a bug with `ShortHPBar_CalcPixelFrame` in [engine/anim_hp_bar.asm](engin This can bring Pokémon straight from level 1 to 100 by gaining just a few experience points. -This is a bug with `CalcExpAtLevel` in [main.asm](main.asm): +This is a bug with `CalcExpAtLevel` in [main.asm](/main.asm): ```asm CalcExpAtLevel: ; 50e47 @@ -235,7 +531,7 @@ CalcExpAtLevel: ; 50e47 ([Video](https://www.youtube.com/watch?v=o54VjpAEoO8)) -This is a bug with `Text_ABoostedStringBuffer2ExpPoints` and `Text_StringBuffer2ExpPoints` in [text/common_2.asm](text/common_2.asm): +This is a bug with `Text_ABoostedStringBuffer2ExpPoints` and `Text_StringBuffer2ExpPoints` in [text/common_2.asm](/text/common_2.asm): ```asm Text_ABoostedStringBuffer2ExpPoints:: @@ -257,129 +553,9 @@ Text_StringBuffer2ExpPoints:: **Fix:** Change both `deciram StringBuffer2, 2, 4` to `deciram StringBuffer2, 2, 5`. -## NPC use of Full Heal or Full Restore does not cure Nightmare status - -([Video](https://www.youtube.com/watch?v=rGqu3d3pdok&t=322)) - -This is a bug with `AI_HealStatus` in [battle/ai/items.asm](battle/ai/items.asm): - -```asm -AI_HealStatus: ; 384e0 - ld a, [CurOTMon] - ld hl, OTPartyMon1Status - ld bc, PARTYMON_STRUCT_LENGTH - call AddNTimes - xor a - ld [hl], a - ld [EnemyMonStatus], a - ; Bug: this should reset SUBSTATUS_NIGHTMARE too - ; Uncomment the lines below to fix - ; ld hl, EnemySubStatus1 - ; res SUBSTATUS_NIGHTMARE, [hl] - ld hl, EnemySubStatus5 - res SUBSTATUS_TOXIC, [hl] - ret -; 384f7 -``` - -**Fix:** Uncomment `ld hl, EnemySubStatus1` and `res SUBSTATUS_NIGHTMARE, [hl]`. - - -## "Smart" AI encourages Mean Look if its own Pokémon is badly poisoned - -([Video](https://www.youtube.com/watch?v=cygMO-zHTls)) - -This is a bug with `AI_Smart_MeanLook` in [battle/ai/scoring.asm](battle/ai/scoring.asm): - -```asm -; 80% chance to greatly encourage this move if the enemy is badly poisoned (buggy). -; Should check PlayerSubStatus5 instead. - ld a, [EnemySubStatus5] - bit SUBSTATUS_TOXIC, a - jr nz, .asm_38e26 -``` - -**Fix:** Change `EnemySubStatus5` to `PlayerSubStatus5`. - - -## A Disabled, PP Up–enhanced move may not trigger automatic Struggling - -([Video](https://www.youtube.com/watch?v=1v9x4SgMggs)) - -This is a bug with `CheckPlayerHasUsableMoves` in [battle/core.asm](battle/core.asm): - -```asm -.done - ; Bug: this will result in a move with PP Up confusing the game. - ; Replace with "and $3f" to fix. - and a - ret nz - -.force_struggle - ld hl, BattleText_PkmnHasNoMovesLeft - call StdBattleTextBox - ld c, 60 - call DelayFrames - xor a - ret -``` - -**Fix:** Change `and a` to `and $3f`. - - -## Counter and Mirror Coat still work if the opponent uses an item - -([Video](https://www.youtube.com/watch?v=uRYyzKRatFk)) - -*To do:* Identify specific code causing this bug and fix it. - - -## Present damage is incorrect in link battles - -([Video](https://www.youtube.com/watch?v=XJaQoKtrEuw)) - -This bug existed for all battles in Gold and Silver, and was only fixed for single-player battles in Crystal to preserve link compatibility. - -This is a bug with `BattleCommand_Present` in [battle/effects/present.asm](battle/effects/present.asm): - -```asm -BattleCommand_Present: ; 37874 -; present - - ld a, [wLinkMode] - cp LINK_COLOSSEUM - jr z, .colosseum_skippush - push bc - push de -.colosseum_skippush - - call BattleCommand_Stab - - ld a, [wLinkMode] - cp LINK_COLOSSEUM - jr z, .colosseum_skippop - pop de - pop bc -.colosseum_skippop -``` - -**Fix:** - -```asm -BattleCommand_Present: ; 37874 -; present - - push bc - push de - call BattleCommand_Stab - pop de - pop bc -``` - - ## BRN/PSN/PAR do not affect catch rate -This is a bug with `PokeBall` in [items/item_effects.asm](items/item_effects.asm): +This is a bug with `PokeBall` in [items/item_effects.asm](/items/item_effects.asm): ```asm .statuscheck @@ -411,7 +587,7 @@ This is a bug with `PokeBall` in [items/item_effects.asm](items/item_effects.asm ## Moon Ball does not boost catch rate -This is a bug with `MoonBallMultiplier` in [items/item_effects.asm](items/item_effects.asm): +This is a bug with `MoonBallMultiplier` in [items/item_effects.asm](/items/item_effects.asm): ```asm MoonBallMultiplier: @@ -437,7 +613,7 @@ MoonBallMultiplier: ## Love Ball boosts catch rate for the wrong gender -This is a bug with `LoveBallMultiplier` in [items/item_effects.asm](items/item_effects.asm): +This is a bug with `LoveBallMultiplier` in [items/item_effects.asm](/items/item_effects.asm): ```asm LoveBallMultiplier: @@ -459,7 +635,7 @@ LoveBallMultiplier: ## Fast Ball only boosts catch rate for three Pokémon -This is a bug with `FastBallMultiplier` in [items/item_effects.asm](items/item_effects.asm): +This is a bug with `FastBallMultiplier` in [items/item_effects.asm](/items/item_effects.asm): ```asm FastBallMultiplier: @@ -483,26 +659,9 @@ FastBallMultiplier: **Fix:** Change `jr nz, .next` to `jr nz, .loop`. -## Friend Ball catches sent to the PC overwrite the wrong Pokémon's happiness - -This is a bug with `PokeBall` in [items/item_effects.asm](items/item_effects.asm): - -```asm - ld a, [CurItem] - cp FRIEND_BALL - jr nz, .SkipBoxMonFriendBall - ; Bug: overwrites the happiness of the first mon in the box! - ld a, FRIEND_BALL_HAPPINESS - ld [sBoxMon1Happiness], a -.SkipBoxMonFriendBall: -``` - -`sBoxMon1Happiness` is written *before* the Friend Ball Pokémon is deposited. - - ## Dragon Scale, not Dragon Fang, boosts Dragon-type moves -This is a bug with `ItemAttributes` in [items/item_attributes.asm](items/item_attributes.asm): +This is a bug with `ItemAttributes` in [items/item_attributes.asm](/items/item_attributes.asm): ```asm ; DRAGON FANG @@ -517,9 +676,9 @@ This is a bug with `ItemAttributes` in [items/item_attributes.asm](items/item_at **Fix:** Move `HELD_DRAGON_BOOST` to the `DRAGON FANG` attributes and `0` to `DRAGON SCALE`. -## Daisy's massages don't always increase happiness +## 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 [event/special.asm](/event/special.asm): ```asm ; Bug: Subtracting $ff from $ff fails to set c. @@ -568,7 +727,7 @@ Data_DaisyMassage: ; 746b ## Magikarp in Lake of Rage are shorter, not longer -This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [battle/core.asm](battle/core.asm): +This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [battle/core.asm](/battle/core.asm): ```asm .CheckMagikarpArea: @@ -592,11 +751,32 @@ This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [battle/core.asm](battle/ **Fix:** Change both `jr z, .Happiness` to `jr nz, .Happiness`. +## Magikarp lengths can be miscalculated + +This is a bug with `CalcMagikarpLength.BCLessThanDE` in [event/magikarp.asm](/event/magikarp.asm): + +```asm +.BCLessThanDE: ; fbc9a +; Intention: Return bc < de. +; Reality: Return b < d. + ld a, b + cp d + ret c + ret nc ; whoops + ld a, c + cp e + ret +; fbca1 +``` + +**Fix:** Delete `ret nc`. + + ## Battle transitions fail to account for the enemy's level ([Video](https://www.youtube.com/watch?v=eij_1060SMc)) -This is a bug with `StartTrainerBattle_DetermineWhichAnimation` in [engine/battle_start.asm](engine/battle_start.asm): +This is a bug with `StartTrainerBattle_DetermineWhichAnimation` in [engine/battle_start.asm](/engine/battle_start.asm): ```asm StartTrainerBattle_DetermineWhichAnimation: ; 8c365 (23:4365) @@ -637,9 +817,61 @@ StartTrainerBattle_DetermineWhichAnimation: ; 8c365 (23:4365) *To do:* Fix this bug. +## Slot machine payout sound effects cut each other off + +([Video](https://www.youtube.com/watch?v=ojq3xqfRF6I)) + +This is a bug with `Slots_PayoutAnim` in [engine/slot_machine.asm](/engine/slot_machine.asm): + +```asm +.okay + ld [hl], e + dec hl + ld [hl], d + ld a, [wcf64] + and $7 + ret z ; ret nz would be more appropriate + ld de, SFX_GET_COIN_FROM_SLOTS + call PlaySFX + ret +``` + +**Fix:** Change `ret z` to `ret nz`. + + +## Team Rocket battle music is not used for Executives or Scientists + +This is a bug with `PlayBattleMusic` in [main.asm](/main.asm): + +```asm + ; really, they should have included admins and scientists here too... + ld de, MUSIC_ROCKET_BATTLE + cp GRUNTM + jr z, .done + cp GRUNTF + jr z, .done +``` + +**Fix:** + +```asm + ld de, MUSIC_ROCKET_BATTLE + cp GRUNTM + jr z, .done + cp GRUNTF + jr z, .done + cp EXECUTIVEM + jr z, .done + cp EXECUTIVEF + jr z, .done + cp SCIENTIST + jr z, .done +``` + + ## No bump noise if standing on tile `$3E` -This is a bug with `DoPlayerMovement.CheckWarp` in [engine/player_movement.asm](engine/player_movement.asm): +This is a bug with `DoPlayerMovement.CheckWarp` in [engine/player_movement.asm](/engine/player_movement.asm): ```asm ; Bug: Since no case is made for STANDING here, it will check @@ -648,6 +880,8 @@ This is a bug with `DoPlayerMovement.CheckWarp` in [engine/player_movement.asm]( ; making bumps silent. ld a, [WalkingDirection] + ; cp STANDING + ; jr z, .not_warp ld e, a ld d, 0 ld hl, .EdgeWarps @@ -659,6 +893,7 @@ This is a bug with `DoPlayerMovement.CheckWarp` in [engine/player_movement.asm]( ld a, 1 ld [wd041], a ld a, [WalkingDirection] + ; This is in the wrong place. cp STANDING jr z, .not_warp ``` @@ -683,9 +918,60 @@ This is a bug with `DoPlayerMovement.CheckWarp` in [engine/player_movement.asm]( ``` -## `LoadMetatiles` wrap around past 128 blocks +## Playing Entei's Pokédex cry can distort Raikou's and Suicune's -[home/map.asm](home/map.asm): +([Video](https://www.youtube.com/watch?v=z305e4sIO24)) + +The exact cause is unknown, but a workaround exists for `DexEntryScreen_MenuActionJumptable.Cry` in [engine/pokedex.asm](/engine/pokedex.asm): + +```asm +.Cry: ; 40340 + call Pokedex_GetSelectedMon + ld a, [wd265] + call GetCryIndex + ld e, c + ld d, b + call PlayCryHeader + ret +``` + +**Workaround:** + +```asm +.Cry: ; 40340 + ld a, [CurPartySpecies] + call PlayCry + ret +``` + + +## In-battle “`…`” ellipsis is too high + +This is a mistake with the “`…`” tile in [gfx/battle/hp_exp_bar_border.png](/gfx/battle/hp_exp_bar_border.png): + +![image](/docs/images/hp_exp_bar_border.png) + +**Fix:** Lower the ellipsis by two pixels: + +![image](/docs/images/hp_exp_bar_border_fix.png) + + +## Two tiles in the `port` tileset are drawn incorrectly + +This is a mistake with the left-hand warp carpet corner tiles in [gfx/tilesets/port.png](/gfx/tilesets/port.png): + +![image](/docs/images/port.png) + +**Fix:** Adjust them to match the right-hand corner tiles: + +![image](/docs/images/port_fix.png) + + +## `LoadMetatiles` wraps around past 128 blocks + +This bug prevents you from using blocksets with more than 128 blocks. + +In [home/map.asm](/home/map.asm): ```asm ; Set hl to the address of the current metatile data ([TilesetBlocksAddress] + (a) tiles). @@ -716,13 +1002,29 @@ This is a bug with `DoPlayerMovement.CheckWarp` in [engine/player_movement.asm]( *To do:* Identify specific code causing this bug and fix it. +## `Function6ec1` does not correctly limit object movement + +This bug is why the Lapras in Union Cave, which uses `SPRITEMOVEDATA_LAPRAS`, is not restricted by its `1, 1` movement radius. + +In [engine/npc_movement.asm](/engine/npc_movement.asm): + +```asm + ld hl, OBJECT_FLAGS1 + add hl, bc + bit 4, [hl] ; lost, uncomment next line to fix +; jr nz, .resume +``` + +**Fix:** Uncomment `jr nz, .resume`. + + ## `CheckOwnMon` only checks the first five letters of OT names ([Video](https://www.youtube.com/watch?v=GVTTmReM4nQ)) This bug can allow you to talk to Eusine in Celadon City and encounter Ho-Oh with only traded legendary beasts. -[engine/search.asm](engine/search.asm): +In [engine/search.asm](/engine/search.asm): ```asm ; check OT @@ -756,9 +1058,108 @@ endr **Fix:** Change `rept NAME_LENGTH_JAPANESE +- 2` to `rept PLAYER_NAME_LENGTH +- 2`. +## Catching a Transformed Pokémon always catches a Ditto + +This bug can affect Mew or Pokémon other than Ditto that used Transform via Mirror Move or Sketch. + +This is a bug with `PokeBall` in [items/item_effects.asm](/items/item_effects.asm): + +```asm + ld hl, EnemySubStatus5 + ld a, [hl] + push af + set SUBSTATUS_TRANSFORMED, [hl] + +; This code is buggy. Any wild Pokémon that has Transformed will be +; caught as a Ditto, even if it was something else like Mew. +; To fix, do not set [TempEnemyMonSpecies] to DITTO. + bit SUBSTATUS_TRANSFORMED, a + jr nz, .ditto + jr .not_ditto + +.ditto + ld a, DITTO + ld [TempEnemyMonSpecies], a + jr .load_data + +.not_ditto + set SUBSTATUS_TRANSFORMED, [hl] + ld hl, wEnemyBackupDVs + ld a, [EnemyMonDVs] + ld [hli], a + ld a, [EnemyMonDVs + 1] + ld [hl], a + +.load_data + ld a, [TempEnemyMonSpecies] + ld [CurPartySpecies], a + ld a, [EnemyMonLevel] + ld [CurPartyLevel], a + callba LoadEnemyMon + + pop af + ld [EnemySubStatus5], a +``` + +**Fix:** + +```asm + ld hl, EnemySubStatus5 + ld a, [hl] + push af + set SUBSTATUS_TRANSFORMED, [hl] + + bit SUBSTATUS_TRANSFORMED, a + jr nz, .load_data + + ld hl, wEnemyBackupDVs + ld a, [EnemyMonDVs] + ld [hli], a + ld a, [EnemyMonDVs + 1] + ld [hl], a + +.load_data + ld a, [TempEnemyMonSpecies] + ld [CurPartySpecies], a + ld a, [EnemyMonLevel] + ld [CurPartyLevel], a + callba LoadEnemyMon + + pop af + ld [EnemySubStatus5], a +``` + + +## Using a Park Ball in normal battles has a corrupt animation + +([Video](https://www.youtube.com/watch?v=v1ErZdLCIyU)) + +This is a bug with `ParkBall` in [items/item_effects.asm](/items/item_effects.asm): + +```asm +.room_in_party + xor a + ld [wWildMon], a + ld a, [CurItem] + cp PARK_BALL + call nz, ReturnToBattle_UseBall +``` + +**Fix:** + +```asm +.room_in_party + xor a + ld [wWildMon], a + ld a, [BattleType] + cp BATTLETYPE_CONTEST + call nz, ReturnToBattle_UseBall +``` + + ## `HELD_CATCH_CHANCE` has no effect -This is a bug with `PokeBall` in [items/item_effects.asm](items/item_effects.asm): +This is a bug with `PokeBall` in [items/item_effects.asm](/items/item_effects.asm): ```asm ; BUG: callba overwrites a, @@ -780,9 +1181,32 @@ This is a bug with `PokeBall` in [items/item_effects.asm](items/item_effects.asm **Fix:** Uncomment `ld b, a`. +## Only the first three `EvosAttacks` evolution entries can have Stone compatibility reported correctly + +This is a bug with `PlacePartyMonEvoStoneCompatibility.DetermineCompatibility` in [engine/party_menu.asm](/engine/party_menu.asm): + +```asm +.DetermineCompatibility: ; 50268 + ld de, StringBuffer1 + ld a, BANK(EvosAttacksPointers) + ld bc, 2 + call FarCopyBytes + ld hl, StringBuffer1 + ld a, [hli] + ld h, [hl] + ld l, a + ld de, StringBuffer1 + ld a, BANK(EvosAttacks) + ld bc, $a + call FarCopyBytes +``` + +**Fix:** Change `ld bc, $a` to `ld bc, $10` to support up to five Stone entries. + + ## `ScriptCall` can overflow `wScriptStack` and crash -[engine/scripting.asm](engine/scripting.asm): +In [engine/scripting.asm](/engine/scripting.asm): ```asm ScriptCall: @@ -820,12 +1244,12 @@ ScriptCall: ## `LoadSpriteGFX` does not limit the capacity of `UsedSprites` -[engine/overworld.asm](engine/overworld.asm): +In [engine/overworld.asm](/engine/overworld.asm): ```asm LoadSpriteGFX: ; 14306 -; Bug: b is not preserved, so -; it's useless as a next count. +; Bug: b is not preserved, so it's useless as a next count. +; Uncomment the lines below to fix. ld hl, UsedSprites ld b, SPRITE_GFX_LIST_CAPACITY @@ -844,18 +1268,20 @@ LoadSpriteGFX: ; 14306 ret .LoadSprite: + ; push bc call GetSprite + ; pop bc ld a, l ret ; 1431e ``` -`GetSprite` modifies `b`. Surround it with `push bc`/`pop bc` to fix. +**Fix:** Uncomment `push bc` and `pop bc`. ## `ChooseWildEncounter` doesn't really validate the wild Pokémon species -[engine/wildmons.asm](engine/wildmons.asm): +In [engine/wildmons.asm](/engine/wildmons.asm): ```asm ChooseWildEncounter: ; 2a14f @@ -894,7 +1320,7 @@ ValidateTempWildMonSpecies: ; 2a4a0 ## `TryObjectEvent` arbitrary code execution -[engine/events.asm](engine/events.asm): +In [engine/events.asm](/engine/events.asm): ```asm ; Bug: If IsInArray returns nc, data at bc will be executed as code. @@ -922,7 +1348,7 @@ ValidateTempWildMonSpecies: ; 2a4a0 ## `Special_CheckBugContestContestantFlag` can read beyond its data table -[event/bug_contest_2.asm](event/bug_contest_2.asm): +In [event/bug_contest_2.asm](/event/bug_contest_2.asm): ```asm Special_CheckBugContestContestantFlag: ; 139ed @@ -960,7 +1386,7 @@ BugCatchingContestantEventFlagTable: ; 139fe ## `ClearWRAM` only clears WRAM bank 1 -[home/init.asm](home/init.asm): +In [home/init.asm](/home/init.asm): ```asm ClearWRAM:: ; 25a @@ -988,7 +1414,7 @@ ClearWRAM:: ; 25a ## `GetForestTreeFrame` works, but it's still bad -[tilesets/animations.asm](tilesets/animations.asm): +In [tilesets/animations.asm](/tilesets/animations.asm): ```asm GetForestTreeFrame: ; fc54c diff --git a/docs/effect_commands.md b/docs/effect_commands.md new file mode 100644 index 000000000..3112950a9 --- /dev/null +++ b/docs/effect_commands.md @@ -0,0 +1,358 @@ +# Effect Commands + +Defined in [macros/scripts/effect_commands.asm](/macros/scripts/effect_commands.asm) and [battle/effect_command_pointers.asm:BattleCommandPointers](/battle/effect_command_pointers.asm). + + +## `$01`: `checkturn` + +## `$02`: `checkobedience` + +## `$03`: `usedmovetext` + +## `$04`: `doturn` + +## `$05`: `critical` + +## `$06`: `damagestats` + +## `$07`: `stab` + +## `$08`: `damagevariation` + +## `$09`: `checkhit` + +## `$0A`: `lowersub` + +## `$0B`: `hittargetnosub` + +## `$0C`: `raisesub` + +## `$0D`: `failuretext` + +## `$0E`: `checkfaint` + +## `$0F`: `criticaltext` + +## `$10`: `supereffectivetext` + +## `$11`: `checkdestinybond` + +## `$12`: `buildopponentrage` + +## `$13`: `poisontarget` + +## `$14`: `sleeptarget` + +## `$15`: `draintarget` + +## `$16`: `eatdream` + +## `$17`: `burntarget` + +## `$18`: `freezetarget` + +## `$19`: `paralyzetarget` + +## `$1A`: `selfdestruct` + +## `$1B`: `mirrormove` + +## `$1C`: `statup` + +## `$1D`: `statdown` + +## `$1E`: `payday` + +## `$1F`: `conversion` + +## `$20`: `resetstats` + +## `$21`: `storeenergy` + +## `$22`: `unleashenergy` + +## `$23`: `forceswitch` + +## `$24`: `endloop` + +## `$25`: `flinchtarget` + +## `$26`: `ohko` + +## `$27`: `recoil` + +## `$28`: `mist` + +## `$29`: `focusenergy` + +## `$2A`: `confuse` + +## `$2B`: `confusetarget` + +## `$2C`: `heal` + +## `$2D`: `transform` + +## `$2E`: `screen` + +## `$2F`: `poison` + +## `$30`: `paralyze` + +## `$31`: `substitute` + +## `$32`: `rechargenextturn` + +## `$33`: `mimic` + +## `$34`: `metronome` + +## `$35`: `leechseed` + +## `$36`: `splash` + +## `$37`: `disable` + +## `$38`: `cleartext` + +## `$39`: `charge` + +## `$3A`: `checkcharge` + +## `$3B`: `traptarget` + +## `$3C`: `effect0x3c` + +## `$3D`: `rampage` + +## `$3E`: `checkrampage` + +## `$3F`: `constantdamage` + +## `$40`: `counter` + +## `$41`: `encore` + +## `$42`: `painsplit` + +## `$43`: `snore` + +## `$44`: `conversion2` + +## `$45`: `lockon` + +## `$46`: `sketch` + +## `$47`: `defrostopponent` + +## `$48`: `sleeptalk` + +## `$49`: `destinybond` + +## `$4A`: `spite` + +## `$4B`: `falseswipe` + +## `$4C`: `healbell` + +## `$4D`: `kingsrock` + +## `$4E`: `triplekick` + +## `$4F`: `kickcounter` + +## `$50`: `thief` + +## `$51`: `arenatrap` + +## `$52`: `nightmare` + +## `$53`: `defrost` + +## `$54`: `curse` + +## `$55`: `protect` + +## `$56`: `spikes` + +## `$57`: `foresight` + +## `$58`: `perishsong` + +## `$59`: `startsandstorm` + +## `$5A`: `endure` + +## `$5B`: `checkcurl` + +## `$5C`: `rolloutpower` + +## `$5D`: `effect0x5d` + +## `$5E`: `furycutter` + +## `$5F`: `attract` + +## `$60`: `happinesspower` + +## `$61`: `present` + +## `$62`: `damagecalc` + +## `$63`: `frustrationpower` + +## `$64`: `safeguard` + +## `$65`: `checksafeguard` + +## `$66`: `getmagnitude` + +## `$67`: `batonpass` + +## `$68`: `pursuit` + +## `$69`: `clearhazards` + +## `$6A`: `healmorn` + +## `$6B`: `healday` + +## `$6C`: `healnite` + +## `$6D`: `hiddenpower` + +## `$6E`: `startrain` + +## `$6F`: `startsun` + +## `$70`: `attackup` + +## `$71`: `defenseup` + +## `$72`: `speedup` + +## `$73`: `specialattackup` + +## `$74`: `specialdefenseup` + +## `$75`: `accuracyup` + +## `$76`: `evasionup` + +## `$77`: `attackup2` + +## `$78`: `defenseup2` + +## `$79`: `speedup2` + +## `$7A`: `specialattackup2` + +## `$7B`: `specialdefenseup2` + +## `$7C`: `accuracyup2` + +## `$7D`: `evasionup2` + +## `$7E`: `attackdown` + +## `$7F`: `defensedown` + +## `$80`: `speeddown` + +## `$81`: `specialattackdown` + +## `$82`: `specialdefensedown` + +## `$83`: `accuracydown` + +## `$84`: `evasiondown` + +## `$85`: `attackdown2` + +## `$86`: `defensedown2` + +## `$87`: `speeddown2` + +## `$88`: `specialattackdown2` + +## `$89`: `specialdefensedown2` + +## `$8A`: `accuracydown2` + +## `$8B`: `evasiondown2` + +## `$8C`: `statupmessage` + +## `$8D`: `statdownmessage` + +## `$8E`: `statupfailtext` + +## `$8F`: `statdownfailtext` + +## `$90`: `effectchance` + +## `$91`: `statdownanim` + +## `$92`: `statupanim` + +## `$93`: `switchturn` + +## `$94`: `fakeout` + +## `$95`: `bellydrum` + +## `$96`: `psychup` + +## `$97`: `rage` + +## `$98`: `doubleflyingdamage` + +## `$99`: `doubleundergrounddamage` + +## `$9A`: `mirrorcoat` + +## `$9B`: `checkfuturesight` + +## `$9C`: `futuresight` + +## `$9D`: `doubleminimizedamage` + +## `$9E`: `skipsuncharge` + +## `$9F`: `thunderaccuracy` + +## `$A0`: `teleport` + +## `$A1`: `beatup` + +## `$A2`: `ragedamage` + +## `$A3`: `resettypematchup` + +## `$A4`: `allstatsup` + +## `$A5`: `effect0xa5` + +## `$A6`: `raisesubnoanim` + +## `$A7`: `lowersubnoanim` + +## `$A8`: `effect0xa8` + +## `$A9`: `clearmissdamage` + +## `$AA`: `movedelay` + +## `$AB`: `hittarget` + +## `$AC`: `tristatuschance` + +## `$AD`: `supereffectivelooptext` + +## `$AE`: `startloop` + +## `$AF`: `curl` + +## `$FE`: `endturn` + +## `$FF`: `endmove` diff --git a/docs/event_commands.md b/docs/event_commands.md index 662159481..b9bc4a925 100644 --- a/docs/event_commands.md +++ b/docs/event_commands.md @@ -1,5 +1,8 @@ # Event Commands +Defined in [macros/scripts/event.asm](/macros/scripts/event.asm) and [engine/scripting.asm:ScriptCommandTable](/engine/scripting.asm). + + ## `$00`: `scall` *script* ## `$01`: `farscall` *script* diff --git a/docs/images/hp_exp_bar_border.png b/docs/images/hp_exp_bar_border.png new file mode 100644 index 000000000..9d16a042b Binary files /dev/null and b/docs/images/hp_exp_bar_border.png differ diff --git a/docs/images/hp_exp_bar_border_fix.png b/docs/images/hp_exp_bar_border_fix.png new file mode 100644 index 000000000..02d36f8a0 Binary files /dev/null and b/docs/images/hp_exp_bar_border_fix.png differ diff --git a/docs/images/port.png b/docs/images/port.png new file mode 100644 index 000000000..8a18aad7d Binary files /dev/null and b/docs/images/port.png differ diff --git a/docs/images/port_fix.png b/docs/images/port_fix.png new file mode 100644 index 000000000..055a377a5 Binary files /dev/null and b/docs/images/port_fix.png differ diff --git a/docs/move_anim_commands.md b/docs/move_anim_commands.md index 5669187f7..9772550c3 100644 --- a/docs/move_anim_commands.md +++ b/docs/move_anim_commands.md @@ -1,5 +1,8 @@ # Move Animation Commands +Defined in [macros/scripts/move_anim.asm](/macros/scripts/move_anim.asm) and [battle/anims.asm:BattleAnimations](/battle/anims.asm). + + ## `$00`−`$EF`: `anim_wait` *length* ## `$D0`: `anim_obj` *object*, *x*, *y*, *param* diff --git a/docs/movement_commands.md b/docs/movement_commands.md index 702bd1f6c..db86fd2f9 100644 --- a/docs/movement_commands.md +++ b/docs/movement_commands.md @@ -1,5 +1,8 @@ # Movement Commands +Defined in [macros/scripts/movement.asm](/macros/scripts/movement.asm) and [engine/movement.asm:MovementPointers](/engine/movement.asm). + + ## `$00`−`$03`: `turn_head` *direction* ## `$04`−`$07`: `turn_step` *direction* diff --git a/docs/music_commands.md b/docs/music_commands.md index 564ac010a..bf6359068 100644 --- a/docs/music_commands.md +++ b/docs/music_commands.md @@ -1,5 +1,8 @@ # Music Commands +Defined in [macros/scripts/audio.asm](/macros/scripts/audio.asm) and [audio/engine.asm:MusicCommands](/audio/engine.asm). + + ## `musicheader` *n*, *index*, *address* ## `cry_header` *n*, *index*, *address* diff --git a/docs/pic_animations.md b/docs/pic_animations.md index a87932819..57c7f151a 100644 --- a/docs/pic_animations.md +++ b/docs/pic_animations.md @@ -1,5 +1,8 @@ # Pic Animations +Defined in [macros/scripts/gfx_anim.asm](/macros/scripts/gfx_anim.asm) and [battle/anim_commands.asm:BattleAnimCommands](/battle/anim_commands.asm). + + Pic animations are assembled in 3 parts: - Top-level animations: diff --git a/docs/text_commands.md b/docs/text_commands.md index 865ea69b5..cf3a53327 100644 --- a/docs/text_commands.md +++ b/docs/text_commands.md @@ -1,116 +1,146 @@ # Text Commands +Defined in [macros/scripts/text.asm](/macros/scripts/text.asm) and [home/text.asm:TextCommands](/home/text.asm). + + ## `$00`: `text` *text* Start writing text until `"@"`. + ## `$4E`: `next` *text* Move a line down. + ## `$4F`: `line` *text* Start writing at the bottom line. + ## `$50`: `page` *text* Start a new Pokédex page. + ## `$51`: `para` *text* Start a new paragraph. + ## `$55`: `cont` *text* Scroll to the next line. + ## `$57`: `done` End a text box. + ## `$58`: `prompt` Prompt the player to end a text box (initiating some other event). + ## `$01`: `text_from_ram` *address* Write text from a RAM address. + ## `$02`: `text_bcd` *address*, *flags* Write [BCD](bcd) from an address, typically RAM. [bcd]: https://en.wikipedia.org/wiki/Binary-coded_decimal + ## `$03`: `text_move` *address* Move to a new tile. + ## `$04`: `text_box` *address*, *height*, *width* Draw a box. + ## `$05`: `text_low` Write text at (1, 16). + ## `$06`: `text_waitbutton` Wait for button press; show arrow. + ## `$07`: `text_scroll` Pushes text up two lines and sets the `bc` cursor to the border tile below the first character column of the text box. + ## `$08`: `start_asm` Start interpreting assembly code. + ## `$09`: `deciram` *address*, *bytes*, *digits* Read *bytes* bytes from *address* and print them as a *digits*-digit number. + ## `$0A`: `interpret_data` Exit. + ## `$0B`: `sound_dex_fanfare_50_79` Play `SFX_DEX_FANFARE_50_79`. + ## `$0C`: `limited_interpret_data` *number* Print *number* `"…"`s. + ## `$0D`: `link_wait_button` Wait for button press; show arrow. + ## `$0E`: `sound_dex_fanfare_20_49` Play `SFX_DEX_FANFARE_20_49`. + ## `$0F`: `sound_item` Play `SFX_ITEM`. + ## `$10`: `sound_caught_mon` Play `SFX_CAUGHT_MON`. + ## `$11`: `sound_dex_fanfare_80_109` Play `SFX_DEX_FANFARE_80_109`. + ## `$12`: `sound_fanfare` Play `SFX_FANFARE`. + ## `$13`: `sound_slot_machine_start` Play `SFX_SLOT_MACHINE_START`. + ## `$14`: `text_buffer` *id* Write text from one of the following addresses (listed in `StringBufferPointers`): @@ -123,10 +153,12 @@ Write text from one of the following addresses (listed in `StringBufferPointers` 5. `EnemyMonNick` 6. `BattleMonNick` + ## `$15`: `current_day` Print the weekday. + ## `$16`: `text_jump` *address* Write text from a different bank. diff --git a/engine/battle_start.asm b/engine/battle_transition.asm similarity index 99% rename from engine/battle_start.asm rename to engine/battle_transition.asm index 7a16c3b82..f8756649b 100644 --- a/engine/battle_start.asm +++ b/engine/battle_transition.asm @@ -363,19 +363,6 @@ StartTrainerBattle_SetUpForSpinOutro: ; 8c43d (23:443d) ld [wcf64], a ret -spintable_entry: MACRO - db \1 - dw .wedge\2 - dwcoord \3, \4 -ENDM - -; quadrants - const_def - const UPPER_LEFT - const UPPER_RIGHT - const LOWER_LEFT - const LOWER_RIGHT - StartTrainerBattle_SpinToBlack: ; 8c44f (23:444f) xor a ld [hBGMapMode], a @@ -412,7 +399,19 @@ endr ret ; 8c490 (23:4490) +; quadrants + const_def + const UPPER_LEFT + const UPPER_RIGHT + const LOWER_LEFT + const LOWER_RIGHT + .spintable ; 8c490 +spintable_entry: MACRO + db \1 + dw .wedge\2 + dwcoord \3, \4 +ENDM spintable_entry UPPER_LEFT, 1, 1, 6 spintable_entry UPPER_LEFT, 2, 0, 3 spintable_entry UPPER_LEFT, 3, 1, 0 @@ -797,12 +796,6 @@ StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7) sine_wave $100 ; 8c768 -zoombox: macro -; width, height, start y, start x - db \1, \2 - dwcoord \3, \4 -endm - StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768) callba Function5602 ld de, .boxes @@ -835,6 +828,11 @@ StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768) ; 8c792 (23:4792) .boxes ; 8c792 +zoombox: macro +; width, height, start y, start x + db \1, \2 + dwcoord \3, \4 +endm zoombox 4, 2, 8, 8 zoombox 6, 4, 7, 7 zoombox 8, 6, 6, 6 @@ -864,3 +862,12 @@ StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768) jr nz, .row ret ; 8c7c9 (23:47c9) + +Function8c7c9: +; XXX + ld a, $1 + ld [hBGMapMode], a + call WaitBGMap + xor a + ld [hBGMapMode], a + ret diff --git a/engine/breeding/egg.asm b/engine/breeding.asm similarity index 100% rename from engine/breeding/egg.asm rename to engine/breeding.asm diff --git a/engine/card_flip.asm b/engine/card_flip.asm index 063d5324f..cfcd949e6 100755 --- a/engine/card_flip.asm +++ b/engine/card_flip.asm @@ -1415,7 +1415,6 @@ else endc endm - cardflip_cursor 11, 2, .Impossible cardflip_cursor 12, 2, .Impossible cardflip_cursor 13, 2, .PokeGroupPair @@ -1665,50 +1664,7 @@ CardFlip_InitAttrPals: ; e0c37 (38:4c37) ; e0c93 (38:4c93) .palettes ; e0c93 - RGB 31, 31, 31 - RGB 17, 07, 31 - RGB 06, 19, 08 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 29, 25, 00 - RGB 06, 19, 08 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 13, 30 - RGB 06, 19, 08 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 08, 17, 30 - RGB 06, 19, 08 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 08, 31, 08 - RGB 06, 19, 08 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 17, 07, 31 - RGB 06, 19, 08 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 17, 07, 31 - RGB 06, 19, 08 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 17, 07, 31 - RGB 06, 19, 08 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 00, 00 - RGB 31, 00, 00 +INCLUDE "data/palettes/card_flip.pal" ; e0cdb CardFlipLZ03: ; e0cdb @@ -1727,16 +1683,5 @@ CardFlipLZ02: ; e0ea8 INCBIN "gfx/card_flip/card_flip_2.2bpp.lz" CardFlipTilemap: ; e110c - db $ef, $15, $27, $2a, $2a, $06, $27, $2a, $2a, $06, $27 - db $ef, $07, $27, $3e, $3f, $42, $43, $46, $47, $4a, $4b - db $ef, $17, $26, $40, $41, $44, $45, $48, $49, $4c, $4d - db $ef, $25, $04, $00, $01, $00, $01, $00, $01, $00, $01 - db $ef, $05, $14, $10, $11, $10, $11, $10, $11, $10, $11 - db $ef, $16, $24, $20, $21, $20, $21, $20, $21, $20, $21 - db $ef, $25, $04, $00, $02, $00, $02, $00, $02, $00, $02 - db $ef, $05, $14, $10, $12, $10, $12, $10, $12, $10, $12 - db $ef, $16, $24, $20, $22, $20, $22, $20, $22, $20, $22 - db $ef, $25, $04, $00, $03, $00, $03, $00, $03, $00, $03 - db $ef, $05, $14, $10, $13, $10, $13, $10, $13, $10, $13 - db $ef, $16, $24, $20, $23, $20, $23, $20, $23, $20, $23 +INCBIN "gfx/card_flip/card_flip.tilemap" ; e1190 diff --git a/engine/caught_data.asm b/engine/caught_data.asm new file mode 100644 index 000000000..c079009ae --- /dev/null +++ b/engine/caught_data.asm @@ -0,0 +1,247 @@ +CheckPartyFullAfterContest: ; 4d9e5 + ld a, [wContestMon] + and a + jp z, .DidntCatchAnything + ld [CurPartySpecies], a + ld [CurSpecies], a + call GetBaseData + ld hl, PartyCount + ld a, [hl] + cp 6 + jp nc, .TryAddToBox + inc a + ld [hl], a + ld c, a + ld b, $0 + add hl, bc + ld a, [wContestMon] + ld [hli], a + ld [CurSpecies], a + ld a, $ff + ld [hl], a + ld hl, PartyMon1Species + ld a, [PartyCount] + dec a + ld bc, PARTYMON_STRUCT_LENGTH + call AddNTimes + ld d, h + ld e, l + ld hl, wContestMon + ld bc, PARTYMON_STRUCT_LENGTH + call CopyBytes + ld a, [PartyCount] + dec a + ld hl, PartyMonOT + call SkipNames + ld d, h + ld e, l + ld hl, PlayerName + call CopyBytes + ld a, [CurPartySpecies] + ld [wd265], a + call GetPokemonName + ld hl, StringBuffer1 + ld de, wMonOrItemNameBuffer + ld bc, PKMN_NAME_LENGTH + call CopyBytes + call GiveANickname_YesNo + jr c, .Party_SkipNickname + ld a, [PartyCount] + dec a + ld [CurPartyMon], a + xor a + ld [MonType], a + ld de, wMonOrItemNameBuffer + callab InitNickname + +.Party_SkipNickname: + ld a, [PartyCount] + dec a + ld hl, PartyMonNicknames + call SkipNames + ld d, h + ld e, l + ld hl, wMonOrItemNameBuffer + call CopyBytes + ld a, [PartyCount] + dec a + ld hl, PartyMon1Level + call GetPartyLocation + ld a, [hl] + ld [CurPartyLevel], a + call SetCaughtData + ld a, [PartyCount] + dec a + ld hl, PartyMon1CaughtLocation + call GetPartyLocation + ld a, [hl] + and $80 + ld b, $13 + or b + ld [hl], a + xor a + ld [wContestMon], a + and a + ld [ScriptVar], a + ret + +.TryAddToBox: ; 4daa3 + ld a, BANK(sBoxCount) + call GetSRAMBank + ld hl, sBoxCount + ld a, [hl] + cp MONS_PER_BOX + call CloseSRAM + jr nc, .BoxFull + xor a + ld [CurPartyMon], a + ld hl, wContestMon + ld de, wBufferMon + ld bc, BOXMON_STRUCT_LENGTH + call CopyBytes + ld hl, PlayerName + ld de, wBufferMonOT + ld bc, NAME_LENGTH + call CopyBytes + callab InsertPokemonIntoBox + ld a, [CurPartySpecies] + ld [wd265], a + call GetPokemonName + call GiveANickname_YesNo + ld hl, StringBuffer1 + jr c, .Box_SkipNickname + ld a, BOXMON + ld [MonType], a + ld de, wMonOrItemNameBuffer + callab InitNickname + ld hl, wMonOrItemNameBuffer + +.Box_SkipNickname: + ld a, BANK(sBoxMonNicknames) + call GetSRAMBank + ld de, sBoxMonNicknames + ld bc, PKMN_NAME_LENGTH + call CopyBytes + call CloseSRAM + +.BoxFull: + ld a, BANK(sBoxMon1Level) + call GetSRAMBank + ld a, [sBoxMon1Level] + ld [CurPartyLevel], a + call CloseSRAM + call SetBoxMonCaughtData + ld a, BANK(sBoxMon1CaughtLocation) + call GetSRAMBank + ld hl, sBoxMon1CaughtLocation + ld a, [hl] + and $80 + ld b, $13 + or b + ld [hl], a + call CloseSRAM + xor a + ld [wContestMon], a + ld a, $1 + ld [ScriptVar], a + ret + +.DidntCatchAnything: ; 4db35 + ld a, $2 + ld [ScriptVar], a + ret + +GiveANickname_YesNo: ; 4db3b + ld hl, TextJump_GiveANickname + call PrintText + jp YesNoBox + +TextJump_GiveANickname: ; 0x4db44 + ; Give a nickname to the @ you received? + text_jump UnknownText_0x1c12fc + db "@" + +SetCaughtData: ; 4db49 + ld a, [PartyCount] + dec a + ld hl, PartyMon1CaughtLevel + call GetPartyLocation +SetBoxmonOrEggmonCaughtData: ; 4db53 + ld a, [TimeOfDay] + inc a + rrca + rrca + ld b, a + ld a, [CurPartyLevel] + or b + ld [hli], a + ld a, [MapGroup] + ld b, a + ld a, [MapNumber] + ld c, a + cp MAP_POKECENTER_2F + jr nz, .NotPokecenter2F + ld a, b + cp GROUP_POKECENTER_2F + jr nz, .NotPokecenter2F + + ld a, [BackupMapGroup] + ld b, a + ld a, [BackupMapNumber] + ld c, a + +.NotPokecenter2F: + call GetWorldMapLocation + ld b, a + ld a, [PlayerGender] + rrca + or b + ld [hl], a + ret + +SetBoxMonCaughtData: ; 4db83 + ld a, BANK(sBoxMon1CaughtLevel) + call GetSRAMBank + ld hl, sBoxMon1CaughtLevel + call SetBoxmonOrEggmonCaughtData + call CloseSRAM + ret + +SetGiftBoxMonCaughtData: ; 4db92 + push bc + ld a, BANK(sBoxMon1CaughtLevel) + call GetSRAMBank + ld hl, sBoxMon1CaughtLevel + pop bc + call SetGiftMonCaughtData + call CloseSRAM + ret + +SetGiftPartyMonCaughtData: ; 4dba3 + ld a, [PartyCount] + dec a + ld hl, PartyMon1CaughtLevel + push bc + call GetPartyLocation + pop bc +SetGiftMonCaughtData: ; 4dbaf + xor a + ld [hli], a + ld a, $7e + rrc b + or b + ld [hl], a + ret + +SetEggMonCaughtData: ; 4dbb8 (13:5bb8) + ld a, [CurPartyMon] + ld hl, PartyMon1CaughtLevel + call GetPartyLocation + ld a, [CurPartyLevel] + push af + ld a, $1 + ld [CurPartyLevel], a + call SetBoxmonOrEggmonCaughtData + pop af + ld [CurPartyLevel], a + ret diff --git a/predef/cgb.asm b/engine/cgb_layouts.asm similarity index 94% rename from predef/cgb.asm rename to engine/cgb_layouts.asm index 7ede2768f..18fda6170 100644 --- a/predef/cgb.asm +++ b/engine/cgb_layouts.asm @@ -94,7 +94,7 @@ _CGB_BattleColors: ; 8ddb ld h, $0 add hl, hl add hl, hl - ld bc, Palettes_a8be + ld bc, HPBarPals add hl, bc call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_BG_ENEMY_HP ld a, [PlayerHPPal] @@ -102,10 +102,10 @@ _CGB_BattleColors: ; 8ddb ld h, $0 add hl, hl add hl, hl - ld bc, Palettes_a8be + ld bc, HPBarPals add hl, bc call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_BG_PLAYER_HP - ld hl, Palettes_a8ca + ld hl, ExpBarPalette call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_BG_EXP ld de, UnknOBPals pop hl @@ -148,7 +148,7 @@ _CGB_FinishBattleScreenLayout: ; 8e23 ld hl, Palettes_979c ld de, UnknOBPals palette PAL_BATTLE_OB_GRAY ld bc, 6 palettes - ld a, $5 + ld a, BANK(UnknOBPals) call FarCopyWRAM call ApplyAttrMap ret @@ -164,7 +164,7 @@ Mobile_InitPartyMenuBGPal7: ; 8e8b .not_mobile ld de, UnknBGPals palette 7 ld bc, 1 palettes - ld a, $5 + ld a, BANK(UnknBGPals) call FarCopyWRAM ret ; 8e9f @@ -177,7 +177,7 @@ InitPartyMenuBGPal0: ; 8e9f .not_mobile ld de, UnknBGPals palette 0 ld bc, 1 palettes - ld a, $5 + ld a, BANK(UnknBGPals) call FarCopyWRAM ret ; 8eb9 @@ -194,7 +194,7 @@ _CGB_PokegearPals: ; 8eb9 .got_pals ld de, UnknBGPals ld bc, 6 palettes - ld a, $5 + ld a, BANK(UnknBGPals) call FarCopyWRAM call ApplyPals ld a, $1 @@ -209,19 +209,19 @@ _CGB_StatsScreenHPPals: ; 8edb ld h, $0 add hl, hl add hl, hl - ld bc, Palettes_a8be + ld bc, HPBarPals add hl, bc call LoadPalette_White_Col1_Col2_Black ; hp palette ld a, [CurPartySpecies] ld bc, TempMonDVs call GetPlayerOrMonPalettePointer call LoadPalette_White_Col1_Col2_Black ; mon palette - ld hl, Palettes_a8ca + ld hl, ExpBarPalette call LoadPalette_White_Col1_Col2_Black ; exp palette ld hl, StatsScreenPagePals ld de, UnknBGPals palette 3 ld bc, 3 palettes ; pink, green, and blue page palettes - ld a, $5 + ld a, BANK(UnknBGPals) call FarCopyWRAM call WipeAttrMap @@ -309,7 +309,7 @@ _CGB_Pokedex: ; 8f70 ld hl, .PokedexCursorPalette ld de, UnknOBPals palette 7 ; green cursor palette ld bc, 1 palettes - ld a, $5 + ld a, BANK(UnknOBPals) call FarCopyWRAM call ApplyAttrMap call ApplyPals @@ -416,7 +416,7 @@ _CGB_SlotMachine: ; 906e ld hl, SlotMachinePals ld de, UnknBGPals ld bc, 16 palettes - ld a, $5 + ld a, BANK(UnknBGPals) call FarCopyWRAM call WipeAttrMap hlcoord 0, 2, AttrMap @@ -509,7 +509,7 @@ _CGB07: ; 9122 ld hl, .Palette_9156 ld de, UnknOBPals ld bc, 2 palettes - ld a, $5 + ld a, BANK(UnknOBPals) call FarCopyWRAM call WipeAttrMap ret @@ -562,7 +562,7 @@ _CGB11: ; 9195 ld hl, Palettes_b789 ld de, UnknBGPals ld bc, 5 palettes - ld a, $5 + ld a, BANK(UnknBGPals) call FarCopyWRAM call ApplyPals call WipeAttrMap @@ -574,7 +574,7 @@ _CGB_Diploma: ; 91ad ld hl, DiplomaPalettes ld de, UnknBGPals ld bc, 16 palettes - ld a, $5 + ld a, BANK(UnknBGPals) call FarCopyWRAM ld hl, PalPacket_9cb6 + 1 @@ -624,7 +624,7 @@ _CGB_Evolution: ; 91e4 ld hl, Palettes_979c ld de, UnknOBPals palette 2 ld bc, 6 palettes - ld a, $5 + ld a, BANK(UnknOBPals) call FarCopyWRAM .got_palette @@ -640,12 +640,12 @@ _CGB0c: ; 9228 ld hl, Palettes_b6f1 ld de, UnknBGPals ld bc, 5 palettes - ld a, $5 + ld a, BANK(UnknBGPals) call FarCopyWRAM ld hl, Palettes_b719 ld de, UnknOBPals ld bc, 2 palettes - ld a, $5 + ld a, BANK(UnknOBPals) call FarCopyWRAM ld a, SCGB_DIPLOMA ld [SGBPredef], a @@ -672,7 +672,7 @@ _CGB_UnownPuzzle: ; 925e call LoadHLPaletteIntoDE ld a, [rSVBK] push af - ld a, $5 + ld a, BANK(UnknOBPals) ld [rSVBK], a ld hl, UnknOBPals ld a, $1f @@ -802,7 +802,7 @@ _CGB_MoveList: ; 9373 ld h, 0 add hl, hl add hl, hl - ld bc, Palettes_a8be + ld bc, HPBarPals add hl, bc call LoadPalette_White_Col1_Col2_Black call WipeAttrMap @@ -860,7 +860,7 @@ _CGB_PackPals: ; 93d3 .got_gender ld de, UnknBGPals ld bc, 8 palettes ; 6 palettes? - ld a, $5 + ld a, BANK(UnknBGPals) call FarCopyWRAM call WipeAttrMap hlcoord 0, 0, AttrMap @@ -891,67 +891,11 @@ _CGB_PackPals: ; 93d3 ; 9439 .ChrisPackPals: ; 9439 - RGB 31, 31, 31 - RGB 15, 15, 31 - RGB 00, 00, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 15, 15, 31 - RGB 00, 00, 31 - RGB 00, 00, 00 - - RGB 31, 11, 31 - RGB 15, 15, 31 - RGB 00, 00, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 15, 15, 31 - RGB 00, 00, 31 - RGB 31, 00, 00 - - RGB 31, 31, 31 - RGB 15, 15, 31 - RGB 31, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 07, 19, 07 - RGB 07, 19, 07 - RGB 00, 00, 00 +INCLUDE "data/palettes/pack.pal" ; 9469 .KrisPackPals: ; 9469 - RGB 31, 31, 31 - RGB 31, 14, 31 - RGB 31, 07, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 14, 31 - RGB 31, 07, 31 - RGB 00, 00, 00 - - RGB 15, 15, 31 - RGB 31, 14, 31 - RGB 31, 07, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 14, 31 - RGB 31, 07, 31 - RGB 31, 00, 00 - - RGB 31, 31, 31 - RGB 31, 14, 31 - RGB 31, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 07, 19, 07 - RGB 07, 19, 07 - RGB 00, 00, 00 +INCLUDE "data/palettes/pack_f.pal" ; 9499 _CGB_Pokepic: ; 9499 @@ -1057,10 +1001,10 @@ _CGB1e: ; 9542 _CGB_TradeTube: ; 9555 ld hl, PalPacket_9cc6 + 1 call CopyFourPalettes - ld hl, Palettes_b681 + ld hl, PartyMenuOBPals ld de, UnknOBPals ld bc, 1 palettes - ld a, $5 + ld a, BANK(UnknOBPals) call FarCopyWRAM ld de, UnknOBPals palette 7 ld a, $1c @@ -1086,7 +1030,7 @@ _CGB_MysteryGift: ; 9591 ld hl, .Palettes ld de, UnknBGPals ld bc, 2 palettes - ld a, $5 + ld a, BANK(UnknBGPals) call FarCopyWRAM call ApplyPals call WipeAttrMap diff --git a/engine/check_battle_scene.asm b/engine/check_battle_scene.asm new file mode 100644 index 000000000..b63f00907 --- /dev/null +++ b/engine/check_battle_scene.asm @@ -0,0 +1,47 @@ +CheckBattleScene: ; 4ea44 +; Return carry if battle scene is turned off. + + ld a, 0 + ld hl, wLinkMode + call GetFarWRAMByte + cp LINK_MOBILE + jr z, .mobile + + ld a, [Options] + bit BATTLE_SCENE, a + jr nz, .off + + and a + ret + +.mobile + ld a, [wcd2f] + and a + jr nz, .from_wram + + ld a, $4 + call GetSRAMBank + ld a, [$a60c] + ld c, a + call CloseSRAM + + ld a, c + bit 0, c + jr z, .off + + and a + ret + +.from_wram + ld a, $5 + ld hl, w5_dc00 + call GetFarWRAMByte + bit 0, a + jr z, .off + + and a + ret + +.off + scf + ret diff --git a/engine/check_nick_errors.asm b/engine/check_nick_errors.asm new file mode 100644 index 000000000..1cedca420 --- /dev/null +++ b/engine/check_nick_errors.asm @@ -0,0 +1,74 @@ +CheckNickErrors:: ; 669f +; error-check monster nick before use +; must be a peace offering to gamesharkers + +; input: de = nick location + + push bc + push de + ld b, PKMN_NAME_LENGTH + +.checkchar +; end of nick? + ld a, [de] + cp "@" ; terminator + jr z, .end + +; check if this char is a text command + ld hl, .textcommands + dec hl +.loop +; next entry + inc hl +; reached end of commands table? + ld a, [hl] + cp -1 + jr z, .done + +; is the current char between this value (inclusive)... + ld a, [de] + cp [hl] + inc hl + jr c, .loop +; ...and this one? + cp [hl] + jr nc, .loop + +; replace it with a "?" + ld a, "?" + ld [de], a + jr .loop + +.done +; next char + inc de +; reached end of nick without finding a terminator? + dec b + jr nz, .checkchar + +; change nick to "?@" + pop de + push de + ld a, "?" + ld [de], a + inc de + ld a, "@" + ld [de], a +.end +; if the nick has any errors at this point it's out of our hands + pop de + pop bc + ret + +.textcommands ; 66cf +; table defining which characters are actually text commands +; format: + ; ≥ < + db "", TX_BOX + 1 + db "", $18 + 1 + db $1d, "%" + 1 + db $35, "" + 1 + db "", "" + 1 + db "", "" + 1 + db "", "┘" + 1 + db -1 ; end diff --git a/engine/check_time.asm b/engine/check_time.asm new file mode 100644 index 000000000..615b51d29 --- /dev/null +++ b/engine/check_time.asm @@ -0,0 +1,19 @@ +CheckTime:: ; c000 + ld a, [TimeOfDay] + ld hl, TimeOfDayTable + ld de, 2 + call IsInArray + inc hl + ld c, [hl] + ret c + + xor a + ld c, a + ret + +TimeOfDayTable: ; c012 + db MORN_F, MORN + db DAY_F, DAY + db NITE_F, NITE + db NITE_F, NITE + db -1 diff --git a/engine/color.asm b/engine/color.asm index add8c24ac..12f22d4c1 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -1,5 +1,4 @@ -PALPACKET_LENGTH EQU $10 -INCLUDE "predef/sgb.asm" +INCLUDE "engine/sgb_layouts.asm" SHINY_ATK_BIT EQU 5 SHINY_DEF_VAL EQU 10 @@ -355,7 +354,7 @@ ApplyHPBarPals: ld h, $0 add hl, hl add hl, hl - ld bc, Palettes_a8be + ld bc, HPBarPals add hl, bc ld bc, 4 ld a, $5 @@ -450,57 +449,9 @@ LoadMailPalettes: ret .MailPals: - RGB 20, 31, 11 - RGB 31, 19, 00 - RGB 31, 10, 09 - RGB 00, 00, 00 +INCLUDE "data/palettes/mail.pal" - RGB 15, 20, 31 - RGB 30, 26, 00 - RGB 31, 12, 00 - RGB 00, 00, 00 - - RGB 24, 17, 31 - RGB 30, 26, 00 - RGB 08, 11, 31 - RGB 00, 00, 00 - - RGB 31, 25, 17 - RGB 31, 18, 04 - RGB 28, 12, 05 - RGB 00, 00, 00 - - RGB 19, 26, 31 - RGB 31, 05, 08 - RGB 31, 09, 31 - RGB 00, 00, 00 - - RGB 31, 19, 28 - RGB 31, 21, 00 - RGB 12, 22, 00 - RGB 00, 00, 00 - - RGB 19, 17, 23 - RGB 30, 26, 00 - RGB 31, 12, 00 - RGB 00, 00, 00 - - RGB 07, 26, 31 - RGB 26, 26, 27 - RGB 31, 11, 11 - RGB 00, 00, 00 - - RGB 21, 31, 21 - RGB 30, 26, 00 - RGB 31, 12, 00 - RGB 00, 00, 00 - - RGB 07, 26, 31 - RGB 31, 31, 00 - RGB 00, 21, 00 - RGB 00, 00, 00 - -INCLUDE "predef/cgb.asm" +INCLUDE "engine/cgb_layouts.asm" Function95f0: ; XXX @@ -544,7 +495,7 @@ GetPredefPal: add hl, hl add hl, hl add hl, hl - ld bc, Palettes_9df6 + ld bc, PredefPals add hl, bc ret @@ -731,7 +682,7 @@ CGB_ApplyPartyMenuHPPals: ; 96f3 CGB layout $fc ret InitPartyMenuOBPals: - ld hl, Palettes_b681 + ld hl, PartyMenuOBPals ld de, UnknOBPals ld bc, 2 palettes ld a, $5 @@ -805,42 +756,14 @@ Function9779: mobile dec c jr nz, .loop ld hl, Palettes_979c - ld de, UnknOBPals + 8 * 2 + ld de, UnknOBPals palette 2 ld bc, 2 palettes ld a, $5 call FarCopyWRAM ret Palettes_979c: - RGB 31, 31, 31 - RGB 25, 25, 25 - RGB 13, 13, 13 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 07 - RGB 31, 16, 01 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 19, 24 - RGB 30, 10, 06 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 12, 25, 01 - RGB 05, 14, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 08, 12, 31 - RGB 01, 04, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 24, 18, 07 - RGB 20, 15, 03 - RGB 00, 00, 00 +INCLUDE "data/palettes/979c.pal" Function97cc: ; XXX @@ -1142,7 +1065,7 @@ SGBBorder_PushBGPals: call DisableLCD ld a, %11100100 ld [rBGP], a - ld hl, Palettes_9df6 + ld hl, PredefPals ld de, VTiles1 ld bc, $1000 call CopyData @@ -1351,532 +1274,35 @@ PalPacket_9dc6: db $79, $26, $08, $00, $0b, $39, $cd, $48, $0c, $d0, $34, $a5, $ PalPacket_9dd6: db $79, $1b, $08, $00, $0b, $ea, $ea, $ea, $ea, $ea, $a9, $01, $cd, $4f, $0c, $d0 PalPacket_9de6: db $79, $10, $08, $00, $0b, $4c, $20, $08, $ea, $ea, $ea, $ea, $ea, $60, $ea, $ea -Palettes_9df6: - RGB 31, 31, 31 - RGB 22, 25, 19 - RGB 16, 21, 30 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 27, 28, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 24, 28, 19 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 24, 24, 24 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 21, 23, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 24, 21, 27 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 24, 16 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 25, 30, 26 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 25, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 20, 19 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 26, 19 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 27, 28, 27 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 24, 30, 23 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 29, 24, 29 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 26, 23, 29 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 25, 23, 20 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 29, 26, 18 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 21, 18 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 26, 25, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 22, 21, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 22, 25, 21 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 21, 21, 22 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 20, 20 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 26, 26, 26 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 21, 14, 09 - RGB 15, 20, 20 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 12, 28, 22 - RGB 15, 20, 20 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 07, 07, 07 - RGB 02, 03, 03 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 30, 22, 17 - RGB 16, 14, 19 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 18, 20, 27 - RGB 11, 15, 23 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 20, 10 - RGB 26, 10, 06 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 21, 25, 29 - RGB 14, 19, 25 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 27, 22, 24 - RGB 21, 15, 23 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 28, 20, 15 - RGB 21, 14, 09 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 20, 26, 16 - RGB 09, 20, 11 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 30, 22, 24 - RGB 28, 15, 21 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 28, 14 - RGB 26, 20, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 26, 21, 22 - RGB 15, 15, 18 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 23, 19, 13 - RGB 14, 12, 17 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 16, 18, 21 - RGB 10, 12, 18 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 22, 15, 16 - RGB 17, 02, 05 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 15, 20, 20 - RGB 05, 16, 16 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 23, 15, 19 - RGB 14, 04, 12 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 20, 17, 18 - RGB 18, 13, 11 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 23, 21, 16 - RGB 12, 12, 10 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 21, 25, 29 - RGB 30, 22, 24 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 26, 23, 16 - RGB 29, 14, 09 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 18, 18, 18 - RGB 10, 10, 10 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 30, 26, 15 - RGB 00, 23, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 30, 26, 15 - RGB 31, 23, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 30, 26, 15 - RGB 31, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 29, 26, 19 - RGB 27, 20, 14 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 24, 20, 10 - RGB 21, 00, 04 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 20, 10 - RGB 21, 00, 04 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 30, 26, 16 - RGB 16, 12, 09 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 15, 28, 26 - RGB 12, 22, 26 - RGB 03, 16, 14 - - RGB 31, 31, 31 - RGB 15, 28, 26 - RGB 23, 24, 24 - RGB 00, 00, 00 - - RGB 31, 31, 24 - RGB 07, 27, 19 - RGB 26, 20, 10 - RGB 19, 12, 08 - - RGB 31, 31, 31 - RGB 31, 28, 14 - RGB 31, 13, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 16, 18, 21 - RGB 10, 12, 18 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 23, 21, 16 - RGB 12, 12, 10 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 14, 00 - RGB 07, 11, 15 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 26, 21, 22 - RGB 26, 10, 06 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 30, 27, 04 - RGB 24, 20, 11 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 13, 25 - RGB 24, 20, 11 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 16, 19, 29 - RGB 24, 20, 11 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 30, 22, 24 - RGB 18, 18, 18 - RGB 16, 10, 07 - - RGB 31, 31, 31 - RGB 21, 25, 29 - RGB 18, 18, 18 - RGB 16, 10, 07 - - RGB 31, 31, 31 - RGB 20, 26, 16 - RGB 18, 18, 18 - RGB 16, 10, 07 - - RGB 31, 31, 31 - RGB 31, 28, 14 - RGB 18, 18, 18 - RGB 16, 10, 07 - - RGB 31, 31, 31 - RGB 18, 18, 18 - RGB 26, 10, 06 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 30, 22, 24 - RGB 28, 15, 21 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 26, 20, 00 - RGB 16, 19, 29 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 16, 02, 30 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 16, 13, 04 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 28, 04, 02 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 18, 23, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 24, 20, 11 - RGB 18, 13, 11 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 25, 30, 00 - RGB 25, 30, 00 - - RGB 00, 00, 00 - RGB 08, 11, 11 - RGB 21, 21, 21 - RGB 31, 31, 31 +PredefPals: +INCLUDE "data/palettes/predef.pal" SGBBorderMap: - db $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $14, $14, $15, $14, $16, $14, $17, $14, $17, $54, $16, $54, $15, $54, $14, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14 - db $01, $14, $02, $14, $03, $14, $03, $54, $02, $54, $01, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $24, $14, $25, $14, $26, $14, $07, $14, $07, $54, $26, $54, $25, $54, $24, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $54, $01, $14, $02, $14, $03, $14, $03, $54, $02, $54, $01, $54 - db $11, $14, $12, $14, $13, $14, $13, $54, $12, $54, $11, $54, $10, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $24, $14, $34, $14, $35, $14, $35, $54, $34, $54, $33, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $10, $14, $11, $14, $12, $14, $13, $14, $13, $54, $12, $54, $11, $54 - db $21, $14, $22, $14, $23, $14, $23, $54, $22, $54, $21, $54, $20, $54, $07, $14, $08, $14, $09, $14, $0a, $14, $0b, $14, $0c, $14, $0d, $14, $07, $14, $07, $14, $18, $14, $09, $14, $1a, $14, $1b, $14, $0d, $14, $0c, $14, $1c, $14, $29, $14, $07, $14, $20, $14, $21, $14, $22, $14, $23, $14, $23, $54, $22, $54, $21, $54 - db $31, $14, $32, $14, $07, $14, $07, $14, $32, $54, $36, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $38, $10, $27, $10, $32, $14, $07, $54, $07, $54, $32, $54, $31, $54 - db $05, $14, $06, $14, $07, $14, $07, $54, $06, $54, $1f, $10, $37, $10, $06, $14, $07, $14, $07, $54, $06, $54, $05, $54 - db $15, $14, $16, $14, $17, $14, $17, $54, $16, $54, $1f, $10, $37, $10, $16, $14, $17, $14, $17, $54, $16, $54, $15, $54 - db $25, $14, $26, $14, $07, $14, $07, $54, $26, $54, $1f, $10, $37, $10, $26, $14, $07, $14, $07, $54, $26, $54, $25, $54 - db $33, $14, $34, $14, $35, $14, $35, $54, $34, $54, $1f, $10, $37, $10, $34, $14, $35, $14, $35, $54, $34, $54, $33, $54 - db $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14 - db $02, $54, $01, $54, $07, $54, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $07, $14, $01, $14, $02, $14 - db $12, $54, $11, $54, $10, $54, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $10, $14, $11, $14, $12, $14 - db $22, $54, $21, $54, $20, $54, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $20, $14, $21, $14, $22, $14 - db $32, $54, $31, $54, $30, $54, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $30, $14, $31, $14, $32, $14 - db $06, $54, $05, $54, $04, $54, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $04, $14, $05, $14, $06, $14 - db $16, $54, $15, $54, $14, $54, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $14, $14, $15, $14, $16, $14 - db $26, $54, $25, $54, $24, $54, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $24, $14, $25, $14, $26, $14 - db $34, $54, $33, $54, $07, $54, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $07, $14, $33, $14, $34, $14 - db $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $1f, $10, $37, $10, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14 - db $01, $14, $02, $14, $03, $14, $03, $54, $02, $54, $1f, $10, $37, $10, $02, $14, $03, $14, $03, $54, $02, $54, $01, $54 - db $11, $14, $12, $14, $13, $14, $13, $54, $12, $54, $1f, $10, $37, $10, $12, $14, $13, $14, $13, $54, $12, $54, $11, $54 - db $21, $14, $22, $14, $23, $14, $23, $54, $22, $54, $1f, $10, $37, $10, $22, $14, $23, $14, $23, $54, $22, $54, $21, $54 - db $31, $14, $32, $14, $07, $14, $07, $14, $32, $54, $1f, $10, $37, $10, $32, $14, $07, $54, $07, $54, $32, $54, $31, $54 - db $05, $14, $06, $14, $07, $14, $07, $54, $06, $54, $2e, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2f, $10, $2d, $10, $06, $14, $07, $14, $07, $54, $06, $54, $05, $54 - db $15, $14, $16, $14, $17, $14, $17, $54, $16, $54, $15, $54, $14, $54, $07, $14, $07, $14, $39, $14, $0e, $14, $09, $14, $0f, $14, $28, $14, $07, $14, $19, $14, $0c, $14, $1c, $14, $29, $14, $2a, $14, $2b, $14, $2c, $14, $39, $14, $07, $14, $07, $14, $14, $14, $15, $14, $16, $14, $17, $14, $17, $54, $16, $54, $15, $54 - db $25, $14, $26, $14, $07, $14, $07, $54, $26, $54, $25, $54, $24, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $01, $14, $02, $14, $03, $14, $03, $54, $02, $54, $01, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $24, $14, $25, $14, $26, $14, $07, $14, $07, $54, $26, $54, $25, $54 - db $33, $14, $34, $14, $35, $14, $35, $54, $34, $54, $24, $54, $07, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $10, $14, $11, $14, $12, $14, $13, $14, $13, $54, $12, $54, $11, $54, $10, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $24, $14, $34, $14, $35, $14, $35, $54, $34, $54, $33, $54 - db $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $20, $14, $21, $14, $22, $14, $23, $14, $23, $54, $22, $54, $21, $54, $20, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14 +INCLUDE "data/sgb_border_map.asm" SGBBorderPalettes: - RGB 24, 06, 06 - RGB 24, 24, 26 - RGB 14, 15, 20 - RGB 04, 07, 10 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 18, 24, 18 - RGB 31, 26, 15 - RGB 26, 19, 10 - RGB 12, 07, 05 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 18, 06, 31 - RGB 31, 31, 29 - RGB 31, 12, 00 - RGB 00, 00, 00 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 12, 31, 06 - RGB 22, 26, 30 - RGB 16, 17, 21 - RGB 00, 03, 00 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 +INCLUDE "data/palettes/sgb_border.pal" SGBBorder: INCBIN "gfx/sgb/sgb_border.2bpp" -Palettes_a8be: +HPBarPals: +; green RGB 30, 26, 15 RGB 00, 23, 00 - +; yellow RGB 30, 26, 15 RGB 31, 21, 00 - +; red RGB 30, 26, 15 RGB 31, 00, 00 -Palettes_a8ca: +ExpBarPalette: +; blue RGB 30, 26, 15 RGB 04, 17, 31 INCLUDE "gfx/pics/palette_pointers.asm" - INCLUDE "gfx/trainer_palettes.asm" LoadMapPals: @@ -2027,324 +1453,34 @@ Palette_b311: ; b311 not mobile RGB 00, 00, 00 TilesetBGPalette: -INCLUDE "tilesets/bg.pal" +INCLUDE "data/palettes/tileset_bg.pal" MapObjectPals:: -INCLUDE "tilesets/ob.pal" +INCLUDE "data/palettes/map_objects.pal" RoofPals: -INCLUDE "tilesets/roof.pal" +INCLUDE "data/palettes/roofs.pal" DiplomaPalettes: - RGB 27, 31, 27 - RGB 21, 21, 21 - RGB 13, 13, 13 - RGB 00, 00, 00 +INCLUDE "data/palettes/diploma.pal" - RGB 27, 31, 27 - RGB 31, 07, 06 - RGB 20, 02, 03 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 10, 31, 09 - RGB 04, 14, 01 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 08, 12, 31 - RGB 01, 04, 31 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 31, 31, 07 - RGB 31, 16, 01 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 22, 16, 08 - RGB 13, 07, 01 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 15, 31, 31 - RGB 05, 17, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 11, 11, 19 - RGB 07, 07, 12 - RGB 00, 00, 00 - -Palettes_b681: - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 31, 07, 04 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 10, 14, 20 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 31, 07, 04 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 31, 07, 04 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 31, 07, 04 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 31, 07, 04 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 31, 07, 04 - RGB 00, 00, 00 - - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 31, 07, 04 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 21, 21, 21 - RGB 13, 13, 13 - RGB 07, 07, 07 - - RGB 31, 31, 31 - RGB 31, 31, 07 - RGB 31, 16, 01 - RGB 07, 07, 07 - - RGB 31, 31, 31 - RGB 31, 19, 24 - RGB 30, 10, 06 - RGB 07, 07, 07 - - RGB 31, 31, 31 - RGB 12, 25, 01 - RGB 05, 14, 00 - RGB 07, 07, 07 - - RGB 31, 31, 31 - RGB 08, 12, 31 - RGB 01, 04, 31 - RGB 07, 07, 07 - - RGB 31, 31, 31 - RGB 24, 18, 07 - RGB 20, 15, 03 - RGB 07, 07, 07 +PartyMenuOBPals: +INCLUDE "data/palettes/party_menu.pal" Palettes_b6f1: - RGB 31, 31, 31 - RGB 18, 23, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 22, 00, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 00, 00 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 25, 22, 00 - RGB 15, 20, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 23, 26, 31 - RGB 18, 23, 31 - RGB 00, 00, 00 +INCLUDE "data/palettes/b6f1.pal" Palettes_b719: - RGB 31, 31, 31 - RGB 07, 06, 03 - RGB 07, 06, 03 - RGB 07, 06, 03 - - RGB 31, 31, 31 - RGB 31, 31, 00 - RGB 26, 22, 00 - RGB 00, 00, 00 +INCLUDE "data/palettes/b719.pal" MalePokegearPals: - RGB 28, 31, 20 - RGB 21, 21, 21 - RGB 13, 13, 13 - RGB 00, 00, 00 - - RGB 28, 31, 20 - RGB 00, 31, 00 - RGB 00, 00, 31 - RGB 00, 00, 00 - - RGB 28, 31, 20 - RGB 00, 31, 00 - RGB 15, 07, 00 - RGB 00, 00, 00 - - RGB 28, 31, 20 - RGB 31, 15, 00 - RGB 15, 07, 00 - RGB 00, 00, 00 - - RGB 28, 31, 20 - RGB 00, 31, 00 - RGB 00, 00, 31 - RGB 31, 00, 00 - - RGB 28, 31, 20 - RGB 00, 31, 00 - RGB 15, 07, 00 - RGB 31, 00, 00 +INCLUDE "data/palettes/pokegear.pal" FemalePokegearPals: - RGB 28, 31, 20 - RGB 21, 21, 21 - RGB 13, 13, 13 - RGB 00, 00, 00 - - RGB 28, 31, 20 - RGB 00, 31, 00 - RGB 00, 00, 31 - RGB 00, 00, 00 - - RGB 28, 31, 20 - RGB 00, 31, 00 - RGB 15, 07, 00 - RGB 00, 00, 00 - - RGB 28, 31, 20 - RGB 10, 18, 31 - RGB 13, 06, 31 - RGB 00, 00, 00 - - RGB 28, 31, 20 - RGB 00, 31, 00 - RGB 00, 00, 31 - RGB 31, 00, 00 - - RGB 28, 31, 20 - RGB 00, 31, 00 - RGB 15, 07, 00 - RGB 31, 00, 00 +INCLUDE "data/palettes/pokegear_f.pal" Palettes_b789: - RGB 31, 31, 31 - RGB 30, 22, 24 - RGB 18, 18, 18 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 10, 11, 31 - RGB 18, 18, 18 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 12, 31, 11 - RGB 18, 18, 18 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 29, 26, 05 - RGB 18, 18, 18 - RGB 00, 00, 00 +INCLUDE "data/palettes/b789.pal" SlotMachinePals: - RGB 31, 31, 31 - RGB 24, 25, 28 - RGB 24, 24, 09 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 30, 10, 06 - RGB 24, 24, 09 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 15, 31, 00 - RGB 24, 24, 09 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 15, 31 - RGB 24, 24, 09 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 15, 21, 31 - RGB 24, 24, 09 - RGB 00, 00, 00 - - RGB 31, 31, 11 - RGB 31, 31, 06 - RGB 24, 24, 09 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 16, 19, 29 - RGB 25, 22, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 21, 21, 21 - RGB 13, 13, 13 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 30, 10, 06 - RGB 31, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 12, 25, 01 - RGB 05, 14, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 12, 25, 01 - RGB 30, 10, 06 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 06 - RGB 20, 15, 03 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 06 - RGB 15, 21, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 06 - RGB 20, 15, 03 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 24, 21 - RGB 31, 13, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - RGB 00, 00, 00 - +INCLUDE "data/palettes/slot_machine.pal" diff --git a/engine/consume_held_item.asm b/engine/consume_held_item.asm new file mode 100644 index 000000000..52d7894cd --- /dev/null +++ b/engine/consume_held_item.asm @@ -0,0 +1,80 @@ +ConsumeHeldItem: ; 27192 + push hl + push de + push bc + ld a, [hBattleTurn] + and a + ld hl, OTPartyMon1Item + ld de, EnemyMonItem + ld a, [CurOTMon] + jr z, .theirturn + ld hl, PartyMon1Item + ld de, BattleMonItem + ld a, [CurBattleMon] + +.theirturn + push hl + push af + ld a, [de] + ld b, a + callba GetItemHeldEffect + ld hl, .ConsumableEffects +.loop + ld a, [hli] + cp b + jr z, .ok + inc a + jr nz, .loop + pop af + pop hl + pop bc + pop de + pop hl + ret + +.ok + xor a + ld [de], a + pop af + pop hl + call GetPartyLocation + ld a, [hBattleTurn] + and a + jr nz, .ourturn + ld a, [wBattleMode] + dec a + jr z, .done + +.ourturn + ld [hl], $0 + +.done + pop bc + pop de + pop hl + ret + +.ConsumableEffects: ; 271de +; Consumable items? + db HELD_BERRY + db HELD_2 + db HELD_5 + db HELD_HEAL_POISON + db HELD_HEAL_FREEZE + db HELD_HEAL_BURN + db HELD_HEAL_SLEEP + db HELD_HEAL_PARALYZE + db HELD_HEAL_STATUS + db HELD_30 + db HELD_ATTACK_UP + db HELD_DEFENSE_UP + db HELD_SPEED_UP + db HELD_SP_ATTACK_UP + db HELD_SP_DEFENSE_UP + db HELD_ACCURACY_UP + db HELD_EVASION_UP + db HELD_38 + db HELD_71 + db HELD_ESCAPE + db HELD_CRITICAL_UP + db -1 diff --git a/engine/credits.asm b/engine/credits.asm index f8cce7a15..0fe7685a6 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -1,122 +1,8 @@ INCLUDE "includes.asm" + SECTION "Credits", ROMX - const_def - const SATOSHI_TAJIRI - const JUNICHI_MASUDA - const TETSUYA_WATANABE - const SHIGEKI_MORIMOTO - const SOUSUKE_TAMADA - const TAKENORI_OOTA - const KEN_SUGIMORI - const MOTOFUMI_FUJIWARA - const ATSUKO_NISHIDA - const MUNEO_SAITO - const SATOSHI_OOTA - const RENA_YOSHIKAWA - const JUN_OKUTANI - const HIRONOBU_YOSHIDA - const ASUKA_IWASHITA - const GO_ICHINOSE - const MORIKAZU_AOKI - const KOHJI_NISHINO - const KENJI_MATSUSHIMA - const TOSHINOBU_MATSUMIYA - const SATORU_IWATA - const NOBUHIRO_SEYA - const KAZUHITO_SEKINE - const TETSUJI_OOTA - const NCL_SUPER_MARIO_CLUB - const SARUGAKUCHO - const AKITO_MORI - const TAKAHIRO_HARADA - const TOHRU_HASHIMOTO - const NOBORU_MATSUMOTO - const TAKEHIRO_IZUSHI - const TAKASHI_KAWAGUCHI - const TSUNEKAZU_ISHIHARA - const HIROSHI_YAMAUCHI - const KENJI_SAIKI - const ATSUSHI_TADA - const NAOKO_KAWAKAMI - const HIROYUKI_ZINNAI - const KUNIMI_KAWAMURA - const HISASHI_SOGABE - const KEITA_KAGAYA - const YOSHINORI_MATSUDA - const HITOMI_SATO - const TORU_OSAWA - const TAKAO_OHARA - const YUICHIRO_ITO - const TAKAO_SHIMIZU - const PLANNING - const KEITA_NAKAMURA - const HIROTAKA_UEMURA - const HIROAKI_TAMURA - const NORIAKI_SAKAGUCHI - const MIYUKI_SATO - const GAKUZI_NOMOTO - const AI_MASHIMA - const MIKIHIRO_ISHIKAWA - const HIDEYUKI_HASHIMOTO - const SATOSHI_YAMATO - const SHIGERU_MIYAMOTO - const GAIL_TILDEN - const NOB_OGASAWARA - const SETH_MCMAHILL - const HIROTO_ALEXANDER - const TERESA_LILLYGREN - const THOMAS_HERTZOG - const ERIK_JOHNSON - const HIRO_NAKAMURA - const TERUKI_MURAKAWA - const KAZUYOSHI_OSAWA - const KIMIKO_NAKAMICHI - const CREDIT_END - const CREDIT_UNKNOWN - const STAFF - const DIRECTOR - const CODIRECTOR - const PROGRAMMERS - const GRAPHICS_DIRECTOR - const MONSTER_DESIGN - const GRAPHICS_DESIGN - const CREDIT_MUSIC - const CREDIT_SOUND_EFFECTS - const GAME_DESIGN - const GAME_SCENARIO - const TOOL_PROGRAMMING - const PARAMETRIC_DESIGN - const SCRIPT_DESIGN - const MAP_DATA_DESIGN - const MAP_DESIGN - const PRODUCT_TESTING - const SPECIAL_THANKS - const PRODUCERS - const EXECUTIVE_PRODUCER - const POKEMON_ANIMATION - const POKEDEX_TEXT - const MOBILE_PRJ_LEADER - const MOBILE_SYSTEM_AD - const MOBILE_STADIUM_DIR - const COORDINATION - const COPYRIGHT - const US_VERSION_STAFF - const US_COORDINATION - const TEXT_TRANSLATION - const PAAD_TESTING - -const_value SET -7 - const CREDITS_THEEND - const CREDITS_WAIT2 - const CREDITS_MUSIC - const CREDITS_CLEAR - const CREDITS_SCENE - const CREDITS_WAIT - const CREDITS_END - - Credits:: ; 109847 bit 6, b ; Hall Of Fame ld a, $0 @@ -635,7 +521,6 @@ GetCreditsPalette: ; 109b2c .UpdatePals: ; Update the first three colors in both palette buffers. - push af push hl add UnknBGPals % $100 @@ -657,72 +542,8 @@ GetCreditsPalette: ; 109b2c call CopyBytes ret - CreditsPalettes: - -; Pichu - RGB 31, 00, 31 - RGB 31, 25, 00 - RGB 11, 14, 31 - RGB 07, 07, 07 - - RGB 31, 05, 05 - RGB 11, 14, 31 - RGB 11, 14, 31 - RGB 31, 31, 31 - - RGB 31, 05, 05 - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 31, 31, 31 - -; Smoochum - RGB 31, 31, 31 - RGB 31, 27, 00 - RGB 26, 06, 31 - RGB 07, 07, 07 - - RGB 03, 13, 31 - RGB 20, 00, 24 - RGB 26, 06, 31 - RGB 31, 31, 31 - - RGB 03, 13, 31 - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 31, 31, 31 - -; Ditto - RGB 31, 31, 31 - RGB 23, 12, 28 - RGB 31, 22, 00 - RGB 07, 07, 07 - - RGB 03, 20, 00 - RGB 31, 22, 00 - RGB 31, 22, 00 - RGB 31, 31, 31 - - RGB 03, 20, 00 - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 31, 31, 31 - -; Igglybuff - RGB 31, 31, 31 - RGB 31, 10, 31 - RGB 31, 00, 09 - RGB 07, 07, 07 - - RGB 31, 14, 00 - RGB 31, 00, 09 - RGB 31, 00, 09 - RGB 31, 31, 31 - - RGB 31, 14, 00 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 +INCLUDE "data/palettes/credits.pal" ; 109bca Credits_LoadBorderGFX: ; 109bca (42:5bca) @@ -791,521 +612,6 @@ Credits_TheEnd: ; 109c11 (42:5c11) ; 109c24 (42:5c24) -CreditsBorderGFX: INCBIN "gfx/credits/border.2bpp" - -CreditsMonsGFX: -CreditsPichuGFX: INCBIN "gfx/credits/pichu.2bpp" -CreditsSmoochumGFX: INCBIN "gfx/credits/smoochum.2bpp" -CreditsDittoGFX: INCBIN "gfx/credits/ditto.2bpp" -CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.2bpp" - - -CreditsScript: ; 10acb4 - -; Clear the banner. - db CREDITS_CLEAR - -; Pokemon Crystal Version Staff - db STAFF, 1 - - db CREDITS_WAIT, 8 - -; Play the credits music. - db CREDITS_MUSIC - - db CREDITS_WAIT2, 10 - - db CREDITS_WAIT, 1 - -; Update the banner. - db CREDITS_SCENE, 0 ; Pichu - - db DIRECTOR, 1 - db SATOSHI_TAJIRI, 2 - - db CREDITS_WAIT, 12 - - db CODIRECTOR, 1 - db JUNICHI_MASUDA, 2 - - db CREDITS_WAIT, 12 - - db PROGRAMMERS, 0 - db SOUSUKE_TAMADA, 1 - db HISASHI_SOGABE, 2 - db KEITA_KAGAYA, 3 - db YOSHINORI_MATSUDA, 4 - - db CREDITS_WAIT, 12 - - db PROGRAMMERS, 0 - db SHIGEKI_MORIMOTO, 1 - db TETSUYA_WATANABE, 2 - db TAKENORI_OOTA, 3 - - db CREDITS_WAIT, 12 - - db GRAPHICS_DIRECTOR, 1 - db KEN_SUGIMORI, 2 - - db CREDITS_WAIT, 12 - - db MONSTER_DESIGN, 0 - db KEN_SUGIMORI, 1 - db MOTOFUMI_FUJIWARA, 2 - db SHIGEKI_MORIMOTO, 3 - db HIRONOBU_YOSHIDA, 4 - db SATOSHI_OOTA, 5 - - db CREDITS_WAIT, 12 - - db MONSTER_DESIGN, 0 - db ATSUKO_NISHIDA, 1 - db MUNEO_SAITO, 2 - db RENA_YOSHIKAWA, 3 - - db CREDITS_WAIT, 12 - - db POKEMON_ANIMATION, 1 - db HIRONOBU_YOSHIDA, 2 - db JUN_OKUTANI, 3 - - db CREDITS_WAIT, 12 - -; Clear the banner. - db CREDITS_CLEAR - - db CREDITS_WAIT, 1 - -; Update the banner. - db CREDITS_SCENE, 1 ; Smoochum - - db GRAPHICS_DESIGN, 0 - db HIRONOBU_YOSHIDA, 1 - db JUN_OKUTANI, 2 - db ASUKA_IWASHITA, 3 - db TETSUYA_WATANABE, 4 - - db CREDITS_WAIT, 12 - - db CREDIT_MUSIC, 0 - db JUNICHI_MASUDA, 1 - db MORIKAZU_AOKI, 2 - db GO_ICHINOSE, 3 - - db CREDITS_WAIT, 12 - - db CREDIT_SOUND_EFFECTS, 0 - db MORIKAZU_AOKI, 1 - db JUNICHI_MASUDA, 2 - db TETSUYA_WATANABE, 3 - - db CREDITS_WAIT, 12 - - db GAME_DESIGN, 0 - db JUNICHI_MASUDA, 1 - db SHIGEKI_MORIMOTO, 2 - db KOHJI_NISHINO, 3 - - db CREDITS_WAIT, 12 - - db GAME_DESIGN, 0 - db TETSUJI_OOTA, 1 - db HITOMI_SATO, 2 - db KENJI_MATSUSHIMA, 3 - - db CREDITS_WAIT, 12 - - db GAME_SCENARIO, 0 - db JUNICHI_MASUDA, 1 - db KOHJI_NISHINO, 2 - db TOSHINOBU_MATSUMIYA, 3 - db KENJI_MATSUSHIMA, 4 - - db CREDITS_WAIT, 12 - - db POKEDEX_TEXT, 1 - db TOSHINOBU_MATSUMIYA, 2 - - db CREDITS_WAIT, 12 - - db TOOL_PROGRAMMING, 1 - db SOUSUKE_TAMADA, 2 - db TAKENORI_OOTA, 3 - - db CREDITS_WAIT, 12 - - db PARAMETRIC_DESIGN, 1 - db KOHJI_NISHINO, 2 - - db CREDITS_WAIT, 12 - -; Clear the banner. - db CREDITS_CLEAR - - db CREDITS_WAIT, 1 - -; Update the banner. - db CREDITS_SCENE, 2 ; Ditto - - db SCRIPT_DESIGN, 1 - db TETSUJI_OOTA, 2 - db NOBUHIRO_SEYA, 3 - - db CREDITS_WAIT, 12 - - db MAP_DATA_DESIGN, 1 - db TETSUJI_OOTA, 2 - db KAZUHITO_SEKINE, 3 - - db CREDITS_WAIT, 12 - - db MAP_DESIGN, 0 - db TETSUJI_OOTA, 1 - db KOHJI_NISHINO, 2 - db NOBUHIRO_SEYA, 3 - - db CREDITS_WAIT, 12 - - db COORDINATION, 1 - db HIROYUKI_ZINNAI, 2 - - db CREDITS_WAIT, 12 - - db PRODUCERS, 0 - db SATORU_IWATA, 1 - db SATOSHI_YAMATO, 2 - db SHIGERU_MIYAMOTO, 3 - - db CREDITS_WAIT, 12 - - db PRODUCERS, 1 - db TSUNEKAZU_ISHIHARA, 2 - - db CREDITS_WAIT, 12 - -; Clear the banner. - db CREDITS_CLEAR - - db CREDITS_WAIT, 1 - -; Update the banner. - db CREDITS_SCENE, 3 ; Igglybuff - - db US_VERSION_STAFF, 2 - - db CREDITS_WAIT, 9 - - db US_COORDINATION, 1 - db GAIL_TILDEN, 2 - db HIRO_NAKAMURA, 3 - - db CREDITS_WAIT, 12 - - db US_COORDINATION, 1 - db JUNICHI_MASUDA, 2 - db SETH_MCMAHILL, 3 - - db CREDITS_WAIT, 12 - - db US_COORDINATION, 1 - db HIROTO_ALEXANDER, 2 - db TERESA_LILLYGREN, 3 - - db CREDITS_WAIT, 12 - - db TEXT_TRANSLATION, 1 - db NOB_OGASAWARA, 2 - - db CREDITS_WAIT, 12 - - db PROGRAMMERS, 1 - db TERUKI_MURAKAWA, 2 - db KAZUYOSHI_OSAWA, 3 - - db CREDITS_WAIT, 12 - - db PAAD_TESTING, 1 - db THOMAS_HERTZOG, 2 - db ERIK_JOHNSON, 3 - - db CREDITS_WAIT, 12 - - db PRODUCT_TESTING, 0 - db PLANNING, 1 - - db CREDITS_WAIT, 12 - - db PRODUCT_TESTING, 0 - db KEITA_NAKAMURA, 1 - db HIROTAKA_UEMURA, 2 - db HIROAKI_TAMURA, 3 - db NORIAKI_SAKAGUCHI, 4 - - db CREDITS_WAIT, 12 - - db PRODUCT_TESTING, 0 - db NCL_SUPER_MARIO_CLUB, 1 - db KENJI_SAIKI, 2 - db ATSUSHI_TADA, 3 - db MIYUKI_SATO, 4 - - db CREDITS_WAIT, 12 - - db SPECIAL_THANKS, 0 - db KIMIKO_NAKAMICHI, 1 - db AKITO_MORI, 2 - - db CREDITS_WAIT, 12 - - db SPECIAL_THANKS, 0 - db GAKUZI_NOMOTO, 1 - db AI_MASHIMA, 2 - db KUNIMI_KAWAMURA, 3 - - db CREDITS_WAIT, 12 - - db SPECIAL_THANKS, 0 - db MIKIHIRO_ISHIKAWA, 1 - db HIDEYUKI_HASHIMOTO, 2 - - db CREDITS_WAIT, 12 - - db EXECUTIVE_PRODUCER, 1 - db HIROSHI_YAMAUCHI, 2 - - db CREDITS_WAIT, 12 - - db COPYRIGHT, 1 - - db CREDITS_WAIT, 9 - -; Display "The End" graphic. - db CREDITS_THEEND - - db CREDITS_WAIT, 20 - - db CREDITS_END -; 10ae13 - - -CreditsStrings: - dw .SatoshiTajiri - dw .JunichiMasuda - dw .TetsuyaWatanabe - dw .ShigekiMorimoto - dw .SousukeTamada - dw .TakenoriOota - dw .KenSugimori - dw .MotofumiFujiwara - dw .AtsukoNishida - dw .MuneoSaito - dw .SatoshiOota - dw .RenaYoshikawa - dw .JunOkutani - dw .HironobuYoshida - dw .AsukaIwashita - dw .GoIchinose - dw .MorikazuAoki - dw .KohjiNishino - dw .KenjiMatsushima - dw .ToshinobuMatsumiya - dw .SatoruIwata - dw .NobuhiroSeya - dw .KazuhitoSekine - dw .TetsujiOota - dw .NclSuperMarioClub - dw .Sarugakucho - dw .AkitoMori - dw .TakahiroHarada - dw .TohruHashimoto - dw .NoboruMatsumoto - dw .TakehiroIzushi - dw .TakashiKawaguchi - dw .TsunekazuIshihara - dw .HiroshiYamauchi - dw .KenjiSaiki - dw .AtsushiTada - dw .NaokoKawakami - dw .HiroyukiZinnai - dw .KunimiKawamura - dw .HisashiSogabe - dw .KeitaKagaya - dw .YoshinoriMatsuda - dw .HitomiSato - dw .ToruOsawa - dw .TakaoOhara - dw .YuichiroIto - dw .TakaoShimizu - dw .Planning - dw .KeitaNakamura - dw .HirotakaUemura - dw .HiroakiTamura - dw .NoriakiSakaguchi - dw .MiyukiSato - dw .GakuziNomoto - dw .AiMashima - dw .MikihiroIshikawa - dw .HideyukiHashimoto - dw .SatoshiYamato - dw .ShigeruMiyamoto - dw .GailTilden - dw .NobOgasawara - dw .SethMcMahill - dw .HirotoAlexander - dw .TeresaLillygren - dw .ThomasHertzog - dw .ErikJohnson - dw .HiroNakamura - dw .TerukiMurakawa - dw .KazuyoshiOsawa - dw .KimikoNakamichi - dw .End - dw .Unknown - dw .Staff - dw .Director - dw .CoDirector - dw .Programmers - dw .GraphicsDirector - dw .MonsterDesign - dw .GraphicsDesign - dw .Music - dw .SoundEffects - dw .GameDesign - dw .GameScenario - dw .ToolProgramming - dw .ParametricDesign - dw .ScriptDesign - dw .MapDataDesign - dw .MapDesign - dw .ProductTesting - dw .SpecialThanks - dw .Producers - dw .ExecutiveProducer - dw .PokemonAnimation - dw .PokedexText - dw .MobilePrjLeader - dw .MobileSystemAd - dw .MobileStadiumDir - dw .Coordination - dw .Copyright - dw .UsVersionStaff - dw .UsCoordination - dw .TextTranslation - dw .PaadTesting - -.SatoshiTajiri: db " SATOSHI TAJIRI@" ; "たじり さとし@" -.JunichiMasuda: db " JUNICHI MASUDA@" ; "ますだ じゅんいち@" -.TetsuyaWatanabe: db " TETSUYA WATANABE@" ; "わたなべ てつや@" -.ShigekiMorimoto: db " SHIGEKI MORIMOTO@" ; "もりもと しげき@" -.SousukeTamada: db " SOUSUKE TAMADA@" ; "たまだ そうすけ@" -.TakenoriOota: db " TAKENORI OOTA@" ; "おおた たけのり@" -.KenSugimori: db " KEN SUGIMORI@" ; "すぎもり けん@" -.MotofumiFujiwara: db " MOTOFUMI FUJIWARA@" ; "ふじわら もとふみ@" -.AtsukoNishida: db " ATSUKO NISHIDA@" ; "にしだ あつこ@" -.MuneoSaito: db " MUNEO SAITO@" ; "さいとう むねお@" -.SatoshiOota: db " SATOSHI OOTA@" ; "おおた さとし@" -.RenaYoshikawa: db " RENA YOSHIKAWA@" ; "よしかわ れな@" -.JunOkutani: db " JUN OKUTANI@" ; "おくたに じゅん@" -.HironobuYoshida: db " HIRONOBU YOSHIDA@" ; "よしだ ひろのぶ@" -.AsukaIwashita: db " ASUKA IWASHITA@" ; "いわした あすか@" -.GoIchinose: db " GO ICHINOSE@" ; "いちのせ ごう@" -.MorikazuAoki: db " MORIKAZU AOKI@" ; "あおき もりかず@" -.KohjiNishino: db " KOHJI NISHINO@" ; "にしの こうじ@" -.KenjiMatsushima: db " KENJI MATSUSHIMA@" ; "まつしま けんじ@" -.ToshinobuMatsumiya: db "TOSHINOBU MATSUMIYA@" ; "まつみや としのぶ@" -.SatoruIwata: db " SATORU IWATA@" ; "いわた さとる@" -.NobuhiroSeya: db " NOBUHIRO SEYA@" ; "せや のぶひろ@" -.KazuhitoSekine: db " KAZUHITO SEKINE@" ; "せきね かずひと@" -.TetsujiOota: db " TETSUJI OOTA@" ; "おおた てつじ@" -.NclSuperMarioClub: db "NCL SUPER MARIO CLUB@" ; "スーパーマりォクラブ@" -.Sarugakucho: db " SARUGAKUCHO@" ; "さるがくちょう@" -.AkitoMori: db " AKITO MORI@" ; "もり あきと@" -.TakahiroHarada: db " TAKAHIRO HARADA@" ; "はらだ たかひろ@" -.TohruHashimoto: db " TOHRU HASHIMOTO@" ; "はしもと とおる@" -.NoboruMatsumoto: db " NOBORU MATSUMOTO@" ; "まつもと のぼる@" -.TakehiroIzushi: db " TAKEHIRO IZUSHI@" ; "いずし たけひろ@" -.TakashiKawaguchi: db " TAKASHI KAWAGUCHI@" ; "かわぐち たかし@" -.TsunekazuIshihara: db " TSUNEKAZU ISHIHARA@" ; "いしはら つねかず@" -.HiroshiYamauchi: db " HIROSHI YAMAUCHI@" ; "やまうち ひろし@" -.KenjiSaiki: db " KENJI SAIKI@" ; "さいき けんじ@" -.AtsushiTada: db " ATSUSHI TADA@" ; "ただ あつし@" -.NaokoKawakami: db " NAOKO KAWAKAMI@" ; "かわかみ なおこ@" -.HiroyukiZinnai: db " HIROYUKI ZINNAI@" ; "じんない ひろゆき@" -.KunimiKawamura: db " KUNIMI KAWAMURA@" ; "かわむら くにみ@" -.HisashiSogabe: db " HISASHI SOGABE@" ; "そがべ ひさし@" -.KeitaKagaya: db " KEITA KAGAYA@" ; "かがや けいた@" -.YoshinoriMatsuda: db " YOSHINORI MATSUDA@" ; "まつだ よしのり@" -.HitomiSato: db " HITOMI SATO@" ; "さとう ひとみ@" -.ToruOsawa: db " TORU OSAWA@" ; "おおさわ とおる@" -.TakaoOhara: db " TAKAO OHARA@" ; "おおはら たかお@" -.YuichiroIto: db " YUICHIRO ITO@" ; "いとう ゆういちろう@" -.TakaoShimizu: db " TAKAO SHIMIZU@" ; "しみず たかお@" -.Planning: db " SPECIAL PRODUCTION" - next " PLANNING" ; "きかくかいはつぶ@" - next " & DEVELOPMENT DEPT.@" -.KeitaNakamura: db " KEITA NAKAMURA@" ; "なかむら けいた@" -.HirotakaUemura: db " HIROTAKA UEMURA@" ; "うえむら ひろたか@" -.HiroakiTamura: db " HIROAKI TAMURA@" ; "たむら ひろあき@" -.NoriakiSakaguchi: db " NORIAKI SAKAGUCHI@" ; "さかぐち のりあき@" -.MiyukiSato: db " MIYUKI SATO@" ; "さとう みゆき@" -.GakuziNomoto: db " GAKUZI NOMOTO@" ; "のもと がくじ@" -.AiMashima: db " AI MASHIMA@" ; "ましま あい@" -.MikihiroIshikawa: db " MIKIHIRO ISHIKAWA@" ; "いしかわ みきひろ@" -.HideyukiHashimoto: db " HIDEYUKI HASHIMOTO@" ; "はしもと ひでゆき@" -.SatoshiYamato: db " SATOSHI YAMATO@" ; "やまと さとし@" -.ShigeruMiyamoto: db " SHIGERU MIYAMOTO@" ; "みやもと しげる@" -.End: db " END@" ; "おしまい@" -.Unknown: db " ????????@" ; "????????@" -.GailTilden: db " GAIL TILDEN@" -.NobOgasawara: db " NOB OGASAWARA@" -.SethMcMahill: db " SETH McMAHILL@" -.HirotoAlexander: db " HIROTO ALEXANDER@" -.TeresaLillygren: db " TERESA LILLYGREN@" -.ThomasHertzog: db " THOMAS HERTZOG@" -.ErikJohnson: db " ERIK JOHNSON@" -.HiroNakamura: db " HIRO NAKAMURA@" -.TerukiMurakawa: db " TERUKI MURAKAWA@" -.KazuyoshiOsawa: db " KAZUYOSHI OSAWA@" -.KimikoNakamichi: db " KIMIKO NAKAMICHI@" -.Staff: db " #MON" ; "ポケットモンスター" - next " CRYSTAL VERSION" ; " クりスタル バージョン" - next " STAFF@" ; " スタッフ@" -.Director: db " DIRECTOR@" ; "エグゼクティブ ディレクター@" -.CoDirector: db " CO-DIRECTOR@" ; "ディレクター@" -.Programmers: db " PROGRAMMERS@" ; "プログラム@" -.GraphicsDirector: db " GRAPHICS DIRECTOR@" ; "グラフィック ディレクター@" -.MonsterDesign: db " MONSTER DESIGN@" ; "# デザイン@" -.GraphicsDesign: db " GRAPHICS DESIGN@" ; "グラフィック デザイン@" -.Music: db " MUSIC@" ; "おんがく@" -.SoundEffects: db " SOUND EFFECTS@" ; "サウンド エフ→クト@" -.GameDesign: db " GAME DESIGN@" ; "ゲームデザイン@" -.GameScenario: db " GAME SCENARIO@" ; "シナりォ@" -.ToolProgramming: db " TOOL PROGRAMMING@" ; "ツール プログラム@" -.ParametricDesign: db " PARAMETRIC DESIGN@" ; "パラメーター せってい@" -.ScriptDesign: db " SCRIPT DESIGN@" ; "スクりプト せってい@" -.MapDataDesign: db " MAP DATA DESIGN@" ; "マップデータ せってい@" -.MapDesign: db " MAP DESIGN@" ; "マップ デザイン@" -.ProductTesting: db " PRODUCT TESTING@" ; "デバッグプレイ@" -.SpecialThanks: db " SPECIAL THANKS@" ; "スぺシャルサンクス@" -.Producers: db " PRODUCERS@" ; "プロデューサー@" -.ExecutiveProducer: db " EXECUTIVE PRODUCER@" ; "エグゼクティブ プロデューサー@" -.PokemonAnimation: db " #MON ANIMATION@" ; "# アニメーション@" -.PokedexText: db " #DEX TEXT@" ; "ずかん テキスト@" -.MobilePrjLeader: db " MOBILE PRJ. LEADER@" ; "モバイルプロジ→クト りーダー@" -.MobileSystemAd: db " MOBILE SYSTEM AD.@" ; "モバイル システムアドバイザー@" -.MobileStadiumDir: db "MOBILE STADIUM DIR.@" ; "モバイルスタジアム ディレクター@" -.Coordination: db " COORDINATION@" ; "コーディネーター@" -.UsVersionStaff: db " US VERSION STAFF@" -.UsCoordination: db " US COORDINATION@" -.TextTranslation: db " TEXT TRANSLATION@" -.PaadTesting: db " PAAD TESTING@" - -.Copyright: - ; (C) 1 9 9 5 - 2 0 0 1 N i n t e n d o - db $60,$61,$62,$63,$64,$65,$66,$67,$68,$69,$6a,$6b,$6c - ; (C) 1 9 9 5 - 2 0 0 1 C r e a t u r e s i n c . - next $60,$61,$62,$63,$64,$65,$66,$6d,$6e,$6f,$70,$71,$72, $7a,$7b,$7c - ; (C) 1 9 9 5 - 2 0 0 1 G A M E F R E A K i n c . - next $60,$61,$62,$63,$64,$65,$66,$73,$74,$75,$76,$77,$78,$79, $7a,$7b,$7c - db "@" +INCLUDE "gfx/credits.asm" +INCLUDE "data/credits_script.asm" +INCLUDE "data/credits_strings.asm" diff --git a/predef/crystal.asm b/engine/crystal_colors.asm similarity index 52% rename from predef/crystal.asm rename to engine/crystal_colors.asm index 9aa0fbdf2..f8c1a6781 100755 --- a/predef/crystal.asm +++ b/engine/crystal_colors.asm @@ -57,12 +57,12 @@ MG_Mobile_Layout_LoadPals: ; 49351 (12:5351) ld de, UnknBGPals ld hl, Palette_493e1 ld bc, 5 palettes - ld a, $5 ; BANK(UnknBGPals) + ld a, BANK(UnknBGPals) call FarCopyWRAM - ld de, UnknBGPals + 7 palettes + ld de, UnknBGPals palette PAL_BG_TEXT ld hl, Palette_TextBG7 ld bc, 1 palettes - ld a, $5 ; BANK(UnknBGPals) + ld a, BANK(UnknBGPals) call FarCopyWRAM ret @@ -113,37 +113,14 @@ MG_Mobile_Layout_CreatePalBoxes: ; 49384 (12:5384) ; 493e1 (12:53e1) Palette_493e1: ; 493e1 - RGB 03, 07, 09 - RGB 26, 31, 00 - RGB 20, 16, 03 - RGB 31, 31, 31 - - RGB 13, 24, 29 - RGB 11, 16, 30 - RGB 07, 11, 22 - RGB 05, 06, 18 - - RGB 31, 31, 31 - RGB 20, 26, 31 - RGB 13, 24, 29 - RGB 11, 16, 30 - - RGB 31, 31, 31 - RGB 20, 26, 31 - RGB 00, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 20, 16, 08 - RGB 31, 00, 00 - RGB 00, 00, 00 +INCLUDE "data/palettes/mg_mobile.pal" ; 49409 LoadOW_BGPal7:: ; 49409 ld hl, Palette_TextBG7 - ld de, UnknBGPals + 8 * 7 - ld bc, 8 - ld a, $5 + ld de, UnknBGPals palette PAL_BG_TEXT + ld bc, 1 palettes + ld a, BANK(UnknBGPals) call FarCopyWRAM ret ; 49418 @@ -157,19 +134,19 @@ Palette_TextBG7: ; 49418 Function49420:: ; 49420 (12:5420) ld hl, MansionPalette4 - ld de, UnknBGPals + $30 - ld bc, $8 - ld a, $5 ; BANK(UnknBGPals) + ld de, UnknBGPals palette PAL_BG_ROOF + ld bc, 1 palettes + ld a, BANK(UnknBGPals) call FarCopyWRAM ret ; 4942f (12:542f) MG_Mobile_Layout01: ; 4942f call MG_Mobile_Layout_LoadPals - ld de, UnknBGPals + $38 + ld de, UnknBGPals palette PAL_BG_TEXT ld hl, Palette_49478 - ld bc, $8 - ld a, $5 ; BANK(UnknBGPals) + ld bc, 1 palettes + ld a, BANK(UnknBGPals) call FarCopyWRAM call MG_Mobile_Layout_WipeAttrMap hlcoord 0, 0, AttrMap @@ -230,212 +207,13 @@ Function49496: ; 49496 ret ; 494ac -LoadSpecialMapPalette: ; 494ac - ld a, [wTileset] - cp TILESET_POKECOM_CENTER - jr z, .pokecom_2f - cp TILESET_BATTLE_TOWER - jr z, .battle_tower - cp TILESET_ICE_PATH - jr z, .ice_path - cp TILESET_HOUSE_1 - jr z, .house - cp TILESET_RADIO_TOWER - jr z, .radio_tower - cp TILESET_CELADON_MANSION - jr z, .mansion_mobile - jr .do_nothing - -.pokecom_2f - call LoadPokeComPalette - scf - ret - -.battle_tower - call LoadBattleTowerPalette - scf - ret - -.ice_path - ld a, [wPermission] ; permission - and 7 - cp 3 ; Hall of Fame - jr z, .do_nothing - call LoadIcePathPalette - scf - ret - -.house - call LoadHousePalette - scf - ret - -.radio_tower - call LoadRadioTowerPalette - scf - ret - -.mansion_mobile - call LoadMansionPalette - scf - ret - -.do_nothing - and a - ret -; 494f2 - -LoadPokeComPalette: ; 494f2 - ld a, $5 - ld de, UnknBGPals - ld hl, PokeComPalette - ld bc, 8 palettes - call FarCopyWRAM - ret -; 49501 - -PokeComPalette: ; 49501 -INCLUDE "tilesets/pokecom.pal" -; 49541 - -LoadBattleTowerPalette: ; 49541 - ld a, $5 - ld de, UnknBGPals - ld hl, BattleTowerPalette - ld bc, 8 palettes - call FarCopyWRAM - ret -; 49550 - -BattleTowerPalette: ; 49550 -INCLUDE "tilesets/battle_tower.pal" -; 49590 - -LoadIcePathPalette: ; 49590 - ld a, $5 - ld de, UnknBGPals - ld hl, IcePathPalette - ld bc, 8 palettes - call FarCopyWRAM - ret -; 4959f - -IcePathPalette: ; 4959f -INCLUDE "tilesets/ice_path.pal" -; 495df - -LoadHousePalette: ; 495df - ld a, $5 - ld de, UnknBGPals - ld hl, HousePalette - ld bc, 8 palettes - call FarCopyWRAM - ret -; 495ee - -HousePalette: ; 495ee -INCLUDE "tilesets/house.pal" -; 4962e - -LoadRadioTowerPalette: ; 4962e - ld a, $5 - ld de, UnknBGPals - ld hl, RadioTowerPalette - ld bc, 8 palettes - call FarCopyWRAM - ret -; 4963d - -RadioTowerPalette: ; 4963d -INCLUDE "tilesets/radio_tower.pal" -; 4967d - -MansionPalette1: ; 4967d - RGB 30, 28, 26 - RGB 19, 19, 19 - RGB 13, 13, 13 - RGB 07, 07, 07 - - RGB 30, 28, 26 - RGB 31, 19, 24 - RGB 30, 10, 06 - RGB 07, 07, 07 - - RGB 18, 24, 09 - RGB 15, 20, 01 - RGB 09, 13, 00 - RGB 07, 07, 07 - - RGB 30, 28, 26 - RGB 15, 16, 31 - RGB 09, 09, 31 - RGB 07, 07, 07 - - RGB 30, 28, 26 - RGB 31, 31, 07 - RGB 31, 16, 01 - RGB 07, 07, 07 - - RGB 26, 24, 17 - RGB 21, 17, 07 - RGB 16, 13, 03 - RGB 07, 07, 07 - -MansionPalette3: ; 496ad - RGB 30, 28, 26 - RGB 17, 19, 31 - RGB 14, 16, 31 - RGB 07, 07, 07 - - RGB 31, 31, 16 - RGB 31, 31, 16 - RGB 14, 09, 00 - RGB 00, 00, 00 -; 496bd - -MansionPalette4: ; 496bd - RGB 05, 05, 16 - RGB 08, 19, 28 - RGB 00, 00, 00 - RGB 31, 31, 31 -; 496c5 - -LoadMansionPalette: ; 496c5 - ld a, $5 - ld de, UnknBGPals - ld hl, MansionPalette1 - ld bc, 8 palettes - call FarCopyWRAM - ld a, $5 - ld de, UnknBGPals + 4 palettes - ld hl, MansionPalette2 - ld bc, 1 palettes - call FarCopyWRAM - ld a, $5 - ld de, UnknBGPals + 3 palettes - ld hl, MansionPalette3 - ld bc, 1 palettes - call FarCopyWRAM - ld a, $5 - ld de, UnknBGPals + 6 palettes - ld hl, MansionPalette4 - ld bc, 1 palettes - call FarCopyWRAM - ret -; 496fe - -MansionPalette2: ; 496fe - RGB 25, 24, 23 - RGB 20, 19, 19 - RGB 14, 16, 31 - RGB 07, 07, 07 -; 49706 +INCLUDE "tilesets/special_palettes.asm" MG_Mobile_Layout02: ; 49706 ld hl, Palette_49732 ld de, UnknBGPals ld bc, 1 palettes - ld a, $5 + ld a, BANK(UnknBGPals) call FarCopyWRAM callba ApplyPals call MG_Mobile_Layout_WipeAttrMap @@ -443,7 +221,7 @@ MG_Mobile_Layout02: ; 49706 ld hl, Palette_4973a ld de, UnknOBPals ld bc, 1 palettes - ld a, $5 + ld a, BANK(UnknOBPals) call FarCopyWRAM ret ; 49732 @@ -473,45 +251,7 @@ Function49742: ; 49742 ; 49757 Palette_49757: ; 49757 - RGB 31, 31, 63 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 63 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 - - RGB 04, 02, 15 - RGB 21, 00, 21 - RGB 31, 00, 00 - RGB 31, 31, 31 - - RGB 04, 02, 15 - RGB 21, 00, 21 - RGB 30, 16, 26 - RGB 31, 31, 31 - - RGB 04, 02, 15 - RGB 21, 00, 21 - RGB 16, 16, 16 - RGB 31, 31, 31 - - RGB 04, 02, 15 - RGB 21, 00, 21 - RGB 31, 12, 12 - RGB 31, 31, 31 - - RGB 04, 02, 15 - RGB 21, 00, 21 - RGB 07, 08, 31 - RGB 31, 31, 31 - - RGB 04, 02, 15 - RGB 21, 00, 21 - RGB 29, 28, 09 - RGB 31, 31, 31 +INCLUDE "data/palettes/49757.pal" ; 49797 _InitMG_Mobile_LinkTradePalMap: ; 49797 @@ -567,48 +307,30 @@ _InitMG_Mobile_LinkTradePalMap: ; 49797 ; 49811 LoadTradeRoomBGPals: ; 49811 - ld hl, Palette_49826 - ld de, UnknBGPals + $10 - ld bc, $30 - ld a, $5 + ld hl, TradeRoomPalette + ld de, UnknBGPals palette PAL_BG_GREEN + ld bc, 6 palettes + ld a, BANK(UnknBGPals) call FarCopyWRAM callba ApplyPals ret ; 49826 -Palette_49826: ; 49826 - RGB 04, 02, 15 - RGB 07, 09, 31 - RGB 31, 00, 00 - RGB 31, 31, 31 - - RGB 04, 02, 15 - RGB 07, 09, 31 - RGB 15, 23, 30 - RGB 31, 31, 31 - - RGB 04, 02, 15 - RGB 07, 09, 31 - RGB 16, 16, 16 - RGB 31, 31, 31 - - RGB 04, 02, 15 - RGB 07, 09, 31 - RGB 25, 07, 04 - RGB 31, 31, 31 - - RGB 04, 02, 15 - RGB 07, 09, 31 - RGB 03, 22, 08 - RGB 31, 31, 31 - - RGB 04, 02, 15 - RGB 07, 09, 31 - RGB 29, 28, 09 - RGB 31, 31, 31 +TradeRoomPalette: ; 49826 +INCLUDE "data/palettes/trade_room.pal" ; 49856 InitMG_Mobile_LinkTradePalMap: ; 49856 call _InitMG_Mobile_LinkTradePalMap ret ; 4985a + +Unknown_4985a: ; unreferenced + db $ab, $03, $57, $24, $ac, $0e, $13, $32 + db $be, $30, $5b, $4c, $47, $60, $ed, $f2 + db $ab, $03, $55, $26, $aa, $0a, $13, $3a + db $be, $28, $33, $24, $6e, $71, $df, $b0 + db $a8, $00, $e5, $e0, $9a, $fc, $f4, $2c + db $fe, $4c, $a3, $5e, $c6, $3a, $ab, $4d + db $a8, $00, $b5, $b0, $de, $e8, $fc, $1c + db $ba, $66, $f7, $0e, $ba, $5e, $43, $bd diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index d0a0b7281..b417044eb 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -341,29 +341,7 @@ GameFreakLogoScene5: ; e47ab (39:47ab) ; e47ac (39:47ac) GameFreakLogoPalettes: ; e47ac -; Ditto's color as it turns into the Game Freak logo. -; Fade from pink to orange. -; One color per step. - RGB 23, 12, 28 - RGB 23, 12, 27 - RGB 23, 13, 26 - RGB 23, 13, 24 - - RGB 24, 14, 22 - RGB 24, 14, 20 - RGB 24, 15, 18 - RGB 24, 15, 16 - - RGB 25, 16, 14 - RGB 25, 16, 12 - RGB 25, 17, 10 - RGB 25, 17, 08 - - RGB 26, 18, 06 - RGB 26, 18, 04 - RGB 26, 19, 02 - RGB 26, 19, 00 - +INCLUDE "data/palettes/crystal_intro/gamefreak_logo.pal" ; e47cc GameFreakLogo: ; e47cc @@ -506,11 +484,11 @@ IntroScene1: ; e495b (39:495b) ld [rSVBK], a ld hl, Palette_365ad ld de, UnknBGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes ld hl, Palette_365ad ld de, BGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes pop af ld [rSVBK], a @@ -579,11 +557,11 @@ IntroScene3: ; e49fd (39:49fd) ld [rSVBK], a ld hl, Palette_e5edd ld de, UnknBGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes ld hl, Palette_e5edd ld de, BGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes pop af ld [rSVBK], a @@ -645,11 +623,11 @@ IntroScene5: ; e4a7a (39:4a7a) ld [rSVBK], a ld hl, Palette_365ad ld de, UnknBGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes ld hl, Palette_365ad ld de, BGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes pop af ld [rSVBK], a @@ -752,12 +730,12 @@ IntroScene7: ; e4b3f (39:4b3f) ld hl, Palette_e5edd ld de, UnknBGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes ld hl, Palette_e5edd ld de, BGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes pop af @@ -910,11 +888,11 @@ IntroScene11: ; e4c86 (39:4c86) ld [rSVBK], a ld hl, Palette_365ad ld de, UnknBGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes ld hl, Palette_365ad ld de, BGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes pop af ld [rSVBK], a @@ -1037,11 +1015,11 @@ IntroScene13: ; e4d6d (39:4d6d) ld [rSVBK], a ld hl, Palette_e5edd ld de, UnknBGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes ld hl, Palette_e5edd ld de, BGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes pop af ld [rSVBK], a @@ -1146,11 +1124,11 @@ IntroScene15: ; e4e40 (39:4e40) ld [rSVBK], a ld hl, Palette_e77dd ld de, UnknBGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes ld hl, Palette_e77dd ld de, BGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes pop af ld [rSVBK], a @@ -1220,11 +1198,11 @@ IntroScene17: ; e4ef5 (39:4ef5) ld [rSVBK], a ld hl, Palette_e6d6d ld de, UnknBGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes ld hl, Palette_e6d6d ld de, BGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes pop af ld [rSVBK], a @@ -1294,11 +1272,11 @@ IntroScene19: ; e4f7e (39:4f7e) ld [rSVBK], a ld hl, Palette_e77dd ld de, UnknBGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes ld hl, Palette_e77dd ld de, BGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes pop af ld [rSVBK], a @@ -1464,11 +1442,11 @@ IntroScene26: ; e50bb (39:50bb) ld [rSVBK], a ld hl, Palette_e679d ld de, UnknBGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes ld hl, Palette_e679d ld de, BGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes pop af ld [rSVBK], a @@ -1572,47 +1550,7 @@ Intro_Scene24_ApplyPaletteFade: ; e5172 (39:5172) ; e519c (39:519c) .FadePals: ; e519c -; Fade to white. - RGB 24, 12, 09 - RGB 31, 31, 31 - RGB 12, 00, 31 - RGB 00, 00, 00 - - RGB 31, 19, 05 - RGB 31, 31, 31 - RGB 15, 05, 31 - RGB 07, 07, 07 - - RGB 31, 21, 09 - RGB 31, 31, 31 - RGB 18, 09, 31 - RGB 11, 11, 11 - - RGB 31, 23, 13 - RGB 31, 31, 31 - RGB 21, 13, 31 - RGB 15, 15, 15 - - RGB 31, 25, 17 - RGB 31, 31, 31 - RGB 25, 17, 31 - RGB 19, 19, 19 - - RGB 31, 27, 21 - RGB 31, 31, 31 - RGB 27, 21, 31 - RGB 23, 23, 23 - - RGB 31, 29, 25 - RGB 31, 31, 31 - RGB 29, 26, 31 - RGB 27, 27, 27 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - +INCLUDE "data/palettes/crystal_intro/fade.pal" ; e51dc CrystalIntro_InitUnownAnim: ; e51dc (39:51dc) @@ -1685,7 +1623,7 @@ CrystalIntro_UnownFade: ; e5223 (39:5223) push hl push bc ld hl, BGPals - ld bc, 4 * 16 + ld bc, 8 palettes xor a call ByteFill pop bc @@ -2150,85 +2088,8 @@ INCBIN "gfx/intro/003.tilemap.lz" ; e5edd Palette_e5edd: ; e5edd - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 0, 4, 5 - RGB 1, 8, 5 - RGB 4, 12, 9 - RGB 24, 12, 9 - - RGB 0, 4, 5 - RGB 9, 6, 8 - RGB 8, 16, 5 - RGB 5, 10, 4 - - RGB 31, 31, 31 - RGB 9, 6, 8 - RGB 18, 9, 9 - RGB 13, 8, 9 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 2, 5, 22 - RGB 1, 5, 12 - - RGB 31, 31, 31 - RGB 31, 10, 25 - RGB 31, 21, 0 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 21, 31 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 +INCLUDE "data/palettes/crystal_intro/intro_1.pal" +; e5f5d IntroUnownsGFX: ; e5f5d INCBIN "gfx/intro/unowns.2bpp.lz" @@ -2263,85 +2124,8 @@ INCBIN "gfx/intro/007.tilemap.lz" ; e65ad Palette_365ad: ; e65ad - RGB 0, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 - - RGB 0, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 - - RGB 0, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 - - RGB 0, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 - - RGB 0, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 - - RGB 0, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 - - RGB 0, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 - - RGB 0, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 10, 0, 10 - RGB 19, 0, 19 - RGB 31, 0, 31 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 +INCLUDE "data/palettes/crystal_intro/intro_2.pal" +; e662d IntroCrystalUnownsGFX: ; e662d INCBIN "gfx/intro/crystal_unowns.2bpp.lz" @@ -2356,85 +2140,8 @@ INCBIN "gfx/intro/015.tilemap.lz" ; e679d Palette_e679d: ; e679d - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 +INCLUDE "data/palettes/crystal_intro/intro_3.pal" +; e681d IntroSuicuneCloseGFX: ; e681d INCBIN "gfx/intro/suicune_close.2bpp.lz" @@ -2449,85 +2156,8 @@ INCBIN "gfx/intro/011.tilemap.lz" ; e6d6d Palette_e6d6d: ; e6d6d - RGB 24, 12, 9 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 24, 12, 9 - RGB 31, 31, 31 - RGB 8, 9, 31 - RGB 0, 0, 0 - - RGB 24, 12, 9 - RGB 12, 20, 31 - RGB 19, 8, 31 - RGB 0, 0, 0 - - RGB 12, 20, 31 - RGB 8, 9, 31 - RGB 19, 8, 31 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 12, 20, 31 - RGB 8, 9, 31 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 +INCLUDE "data/palettes/crystal_intro/intro_4.pal" +; e6ded IntroSuicuneJumpGFX: ; e6ded INCBIN "gfx/intro/suicune_jump.2bpp.lz" @@ -2554,85 +2184,7 @@ INCBIN "gfx/intro/013.tilemap.lz" ; e77dd Palette_e77dd: ; e77dd - RGB 24, 12, 9 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 24, 12, 9 - RGB 31, 31, 31 - RGB 8, 9, 31 - RGB 0, 0, 0 - - RGB 24, 12, 9 - RGB 24, 12, 9 - RGB 24, 12, 9 - RGB 24, 12, 9 - - RGB 24, 12, 9 - RGB 24, 12, 9 - RGB 24, 12, 9 - RGB 24, 12, 9 - - RGB 24, 12, 9 - RGB 24, 12, 9 - RGB 24, 12, 9 - RGB 24, 12, 9 - - RGB 24, 12, 9 - RGB 24, 12, 9 - RGB 24, 12, 9 - RGB 24, 12, 9 - - RGB 24, 12, 9 - RGB 24, 12, 9 - RGB 24, 12, 9 - RGB 24, 12, 9 - - RGB 24, 12, 9 - RGB 24, 12, 9 - RGB 24, 12, 9 - RGB 24, 12, 9 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 12, 0, 31 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 21, 9, 0 - RGB 21, 9, 0 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 11, 11, 11 - RGB 0, 0, 0 +INCLUDE "data/palettes/crystal_intro/intro_5.pal" IntroUnownBackGFX: ; e785d INCBIN "gfx/intro/unown_back.2bpp.lz" @@ -2646,4 +2198,3 @@ IntroGrass3GFX: ; e7a1d INCBIN "gfx/intro/grass3.2bpp" IntroGrass4GFX: ; e7a5d INCBIN "gfx/intro/grass4.2bpp" - diff --git a/engine/debug.asm b/engine/debug.asm index 9c2bb35c2..bcd53c021 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -159,7 +159,7 @@ Function819a7: ; 819a7 ld [rSVBK], a ld hl, Palette_819f4 ld de, BGPals - ld bc, $80 + ld bc, 16 palettes call CopyBytes ld a, $80 ld [rBGPI], a @@ -193,93 +193,10 @@ Function819a7: ; 819a7 ; 819f4 Palette_819f4: ; 819f4 - ; white - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - ; red - RGB 31, 00, 00 - RGB 31, 00, 00 - RGB 31, 00, 00 - RGB 00, 00, 00 - - ; green - RGB 00, 31, 00 - RGB 00, 31, 00 - RGB 00, 31, 00 - RGB 00, 00, 00 - - ; blue - RGB 00, 00, 31 - RGB 00, 00, 31 - RGB 00, 00, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 +INCLUDE "data/palettes/debug/bg.pal" Palette_81a34: ; 81a34 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - ; red - RGB 31, 31, 31 - RGB 31, 00, 00 - RGB 31, 00, 00 - RGB 00, 00, 00 - - ; green - RGB 31, 31, 31 - RGB 00, 31, 00 - RGB 00, 31, 00 - RGB 00, 00, 00 - - ; blue - RGB 31, 31, 31 - RGB 00, 00, 31 - RGB 00, 00, 31 - RGB 00, 00, 00 +INCLUDE "data/palettes/debug/ob.pal" ; 81a74 Function81a74: ; 81a74 diff --git a/engine/decorations.asm b/engine/decorations.asm index b69f4f3c3..160022b93 100755 --- a/engine/decorations.asm +++ b/engine/decorations.asm @@ -1374,3 +1374,13 @@ _GetDecorationSprite: ; 27085 ld a, c ret ; 27092 + +PadCoords_de: ; 27092 + ld a, d + add 4 + ld d, a + ld a, e + add 4 + ld e, a + call GetBlockLocation + ret diff --git a/misc/gfx_41.asm b/engine/dma_transfer.asm similarity index 94% rename from misc/gfx_41.asm rename to engine/dma_transfer.asm index f627c85ff..a0dad0dde 100755 --- a/misc/gfx_41.asm +++ b/engine/dma_transfer.asm @@ -623,16 +623,3 @@ HDMATransfer_OnlyTopFourRows: ; 104303 jr nz, .outer_loop ret ; 104350 - -ShockEmote: INCBIN "gfx/emotes/shock.2bpp" -QuestionEmote: INCBIN "gfx/emotes/question.2bpp" -HappyEmote: INCBIN "gfx/emotes/happy.2bpp" -SadEmote: INCBIN "gfx/emotes/sad.2bpp" -HeartEmote: INCBIN "gfx/emotes/heart.2bpp" -BoltEmote: INCBIN "gfx/emotes/bolt.2bpp" -SleepEmote: INCBIN "gfx/emotes/sleep.2bpp" -FishEmote: INCBIN "gfx/emotes/fish.2bpp" -JumpShadowGFX: INCBIN "gfx/overworld/shadow.2bpp" -FishingRodGFX: INCBIN "gfx/overworld/fishing_rod.2bpp" -BoulderDustGFX: INCBIN "gfx/overworld/boulder_dust.2bpp" -GrassRustleGFX: INCBIN "gfx/overworld/grass_rustle.2bpp" diff --git a/engine/empty_sram.asm b/engine/empty_sram.asm new file mode 100644 index 000000000..aa4b28e0d --- /dev/null +++ b/engine/empty_sram.asm @@ -0,0 +1,19 @@ +EmptyAllSRAMBanks: ; 4cf1f + ld a, $0 + call .EmptyBank + ld a, $1 + call .EmptyBank + ld a, $2 + call .EmptyBank + ld a, $3 + call .EmptyBank + ret + +.EmptyBank: ; 4cf34 + call GetSRAMBank + ld hl, SRAM_Begin + ld bc, SRAM_End - SRAM_Begin + xor a + call ByteFill + call CloseSRAM + ret diff --git a/engine/european_mail.asm b/engine/european_mail.asm new file mode 100644 index 000000000..8f037cc43 --- /dev/null +++ b/engine/european_mail.asm @@ -0,0 +1,129 @@ +IsMailEuropean: ; 1de5c8 +; return 1 if French +; return 2 if German +; return 3 if Italian +; return 4 if Spanish +; return 0 if none of the above + ld c, $0 + ld hl, sPartyMon1MailAuthorNationality - sPartyMon1Mail + add hl, de + ld a, [hli] + cp "E" + ret nz + ld a, [hli] + inc c + cp "F" + ret z + inc c + cp "G" + ret z + inc c + cp "I" + ret z + inc c + cp "S" + ret z + ld c, $0 + ret + +; The regular font. +StandardEnglishFont: ; 1de5e6 +INCBIN "gfx/font/english.1bpp" + +; An extended font. +FrenchGermanFont: ; 1de9e6 +INCBIN "gfx/font/french_german.1bpp" + +; An even more extended font. +SpanishItalianFont: ; 1dede6 +INCBIN "gfx/font/spanish_italian.1bpp" + +HandleFrenchGermanMail: ; 1df1e6 +; called if mail is french or german +; fix 's 't 'v + ld b, sPartyMon1MailAuthor - sPartyMon1Mail + ld h, d + ld l, e +.loop + ld a, [hl] + cp $dc ; 's in french/german font + jr nz, .check_intermediate_chars + ld a, "'s" + jr .replace + +.check_intermediate_chars + sub "'s" + jr c, .dont_replace + cp "'v" - "'s" + 1 + jr nc, .dont_replace + add $cd + +.replace + ld [hl], a + +.dont_replace + inc hl + dec b + jr nz, .loop + ret + +LireLeCourrierAnglais: +DeutenEnglischenPost: ; 1df203 +; Cette fonction convertit certains des caractères anglais pour +; leur équivalent dans le jeu de caractères français. +; Diese Funktion wandelt bestimmte englische Zeichen, um ihre +; Entsprechung in der Deutschen-Zeichensatz. + ld b, sPartyMon1MailAuthor - sPartyMon1Mail + ld h, d + ld l, e +.loop + ld a, [hl] + cp "'s" + jr nz, .check_intermediate_chars + ld a, $dc + jr .replace + +.check_intermediate_chars + sub $cd + jr c, .dont_replace + cp "'v" - "'s" + 1 + jr nc, .dont_replace + add "'s" + +.replace + ld [hl], a + +.dont_replace + inc hl + dec b + jr nz, .loop + ret + +HandleSpanishItalianMail: ; 1df220 +LeerCorreosIngleses: +LeggiPostaInglese: +; This function converts certain characters between +; the English and Spanish/Italian character sets. +; Esta función convierte ciertos caracteres entre +; el juego de caracteres Inglés y Español. +; Questa funzione converte alcuni caratteri tra +; l'inglese e il set di caratteri italiani. + ld b, sPartyMon1MailAuthor - sPartyMon1Mail + ld h, d + ld l, e +.loop + ld a, [hl] + and $f0 + cp $d0 + jr nz, .dont_replace + ld a, [hl] + add $8 + and $f + or $d0 + ld [hl], a + +.dont_replace + inc hl + dec b + jr nz, .loop + ret diff --git a/engine/experience.asm b/engine/experience.asm new file mode 100644 index 000000000..c33aaf02a --- /dev/null +++ b/engine/experience.asm @@ -0,0 +1,162 @@ +CalcLevel: ; 50e1b + ld a, [TempMonSpecies] + ld [CurSpecies], a + call GetBaseData + ld d, 1 +.next_level + inc d + ld a, d + cp (MAX_LEVEL + 1) % $100 + jr z, .got_level + call CalcExpAtLevel + push hl + ld hl, TempMonExp + 2 + ld a, [hProduct + 3] + ld c, a + ld a, [hld] + sub c + ld a, [hProduct + 2] + ld c, a + ld a, [hld] + sbc c + ld a, [hProduct + 1] + ld c, a + ld a, [hl] + sbc c + pop hl + jr nc, .next_level + +.got_level + dec d + ret + +CalcExpAtLevel: ; 50e47 +; (a/b)*n**3 + c*n**2 + d*n - e + ld a, [BaseGrowthRate] + add a + add a + ld c, a + ld b, 0 + ld hl, GrowthRates + add hl, bc +; Cube the level + call .LevelSquared + ld a, d + ld [hMultiplier], a + call Multiply + +; Multiply by a + ld a, [hl] + and $f0 + swap a + ld [hMultiplier], a + call Multiply +; Divide by b + ld a, [hli] + and $f + ld [hDivisor], a + ld b, 4 + call Divide +; Push the cubic term to the stack + ld a, [hQuotient + 0] + push af + ld a, [hQuotient + 1] + push af + ld a, [hQuotient + 2] + push af +; Square the level and multiply by the lower 7 bits of c + call .LevelSquared + ld a, [hl] + and $7f + ld [hMultiplier], a + call Multiply +; Push the absolute value of the quadratic term to the stack + ld a, [hProduct + 1] + push af + ld a, [hProduct + 2] + push af + ld a, [hProduct + 3] + push af + ld a, [hli] + push af +; Multiply the level by d + xor a + ld [hMultiplicand + 0], a + ld [hMultiplicand + 1], a + ld a, d + ld [hMultiplicand + 2], a + ld a, [hli] + ld [hMultiplier], a + call Multiply +; Subtract e + ld b, [hl] + ld a, [hProduct + 3] + sub b + ld [hMultiplicand + 2], a + ld b, $0 + ld a, [hProduct + 2] + sbc b + ld [hMultiplicand + 1], a + ld a, [hProduct + 1] + sbc b + ld [hMultiplicand], a +; If bit 7 of c is set, c is negative; otherwise, it's positive + pop af + and $80 + jr nz, .subtract +; Add c*n**2 to (d*n - e) + pop bc + ld a, [hProduct + 3] + add b + ld [hMultiplicand + 2], a + pop bc + ld a, [hProduct + 2] + adc b + ld [hMultiplicand + 1], a + pop bc + ld a, [hProduct + 1] + adc b + ld [hMultiplicand], a + jr .done_quadratic + +.subtract +; Subtract c*n**2 from (d*n - e) + pop bc + ld a, [hProduct + 3] + sub b + ld [hMultiplicand + 2], a + pop bc + ld a, [hProduct + 2] + sbc b + ld [hMultiplicand + 1], a + pop bc + ld a, [hProduct + 1] + sbc b + ld [hMultiplicand], a + +.done_quadratic +; Add (a/b)*n**3 to (d*n - e +/- c*n**2) + pop bc + ld a, [hProduct + 3] + add b + ld [hMultiplicand + 2], a + pop bc + ld a, [hProduct + 2] + adc b + ld [hMultiplicand + 1], a + pop bc + ld a, [hProduct + 1] + adc b + ld [hMultiplicand], a + ret + +.LevelSquared: ; 50eed + xor a + ld [hMultiplicand + 0], a + ld [hMultiplicand + 1], a + ld a, d + ld [hMultiplicand + 2], a + ld [hMultiplier], a + jp Multiply + +INCLUDE "data/growth_rates.asm" diff --git a/engine/flag_predef.asm b/engine/flag_predef.asm new file mode 100644 index 000000000..bd4f37882 --- /dev/null +++ b/engine/flag_predef.asm @@ -0,0 +1,70 @@ +FlagPredef: ; 4d7c1 +; Perform action b on flag c in flag array hl. +; If checking a flag, check flag array d:hl unless d is 0. + +; For longer flag arrays, see FlagAction. + + push hl + push bc + +; Divide by 8 to get the byte we want. + push bc + srl c + srl c + srl c + ld b, 0 + add hl, bc + pop bc + +; Which bit we want from the byte + ld a, c + and 7 + ld c, a + +; Shift left until we can mask the bit + ld a, 1 + jr z, .shifted +.shift + add a + dec c + jr nz, .shift +.shifted + ld c, a + +; What are we doing to this flag? + dec b + jr z, .set ; 1 + dec b + jr z, .check ; 2 + +.reset + ld a, c + cpl + and [hl] + ld [hl], a + jr .done + +.set + ld a, [hl] + or c + ld [hl], a + jr .done + +.check + ld a, d + cp 0 + jr nz, .farcheck + + ld a, [hl] + and c + jr .done + +.farcheck + call GetFarByte + and c + +.done + pop bc + pop hl + ld c, a + ret diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm index 5c74b3bff..4f9de8300 100644 --- a/engine/fruit_trees.asm +++ b/engine/fruit_trees.asm @@ -103,7 +103,7 @@ GetFruitTreeItem: ; 4408a ; 44097 -INCLUDE "data/fruit_tree_items.asm" +INCLUDE "data/items/fruit_trees.asm" FruitBearingTreeText: ; 440b5 diff --git a/misc/gbc_only.asm b/engine/gbc_only.asm similarity index 100% rename from misc/gbc_only.asm rename to engine/gbc_only.asm diff --git a/engine/get_breedmon_growth.asm b/engine/get_breedmon_growth.asm new file mode 100644 index 000000000..20c546315 --- /dev/null +++ b/engine/get_breedmon_growth.asm @@ -0,0 +1,27 @@ +GetBreedMon1LevelGrowth: ; e698 + ld hl, wBreedMon1Stats + ld de, TempMon + ld bc, BOXMON_STRUCT_LENGTH + call CopyBytes + callab CalcLevel + ld a, [wBreedMon1Level] + ld b, a + ld a, d + ld e, a + sub b + ld d, a + ret + +GetBreedMon2LevelGrowth: ; e6b3 + ld hl, wBreedMon2Stats + ld de, TempMon + ld bc, BOXMON_STRUCT_LENGTH + call CopyBytes + callab CalcLevel + ld a, [wBreedMon2Level] + ld b, a + ld a, d + ld e, a + sub b + ld d, a + ret diff --git a/engine/init_gender.asm b/engine/init_gender.asm index 3ae856029..dfb3fbdd4 100755 --- a/engine/init_gender.asm +++ b/engine/init_gender.asm @@ -20,7 +20,7 @@ InitCrystalData: ; 48000 ret ; 4802f -INCLUDE "misc/mobile_12.asm" +INCLUDE "mobile/mobile_12.asm" InitGender: ; 48dcb (12:4dcb) call InitGenderScreen diff --git a/engine/init_hof_credits.asm b/engine/init_hof_credits.asm new file mode 100644 index 000000000..0f55a10ab --- /dev/null +++ b/engine/init_hof_credits.asm @@ -0,0 +1,79 @@ +InitDisplayForHallOfFame: ; 4e881 + call ClearBGPalettes + call ClearTileMap + call ClearSprites + call DisableLCD + call LoadStandardFont + call LoadFontsBattleExtra + hlbgcoord 0, 0 + ld bc, VBGMap1 - VBGMap0 + ld a, " " + call ByteFill + hlcoord 0, 0, AttrMap + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + xor a + call ByteFill + xor a + ld [hSCY], a + ld [hSCX], a + call EnableLCD + ld hl, .SavingRecordDontTurnOff + call PrintText + call WaitBGMap2 + call SetPalettes + ret + +.SavingRecordDontTurnOff: ; 0x4e8bd + ; SAVING RECORD… DON'T TURN OFF! + text_jump UnknownText_0x1bd39e + db "@" + +InitDisplayForRedCredits: ; 4e8c2 + call ClearBGPalettes + call ClearTileMap + call ClearSprites + call DisableLCD + call LoadStandardFont + call LoadFontsBattleExtra + hlbgcoord 0, 0 + ld bc, VBGMap1 - VBGMap0 + ld a, " " + call ByteFill + hlcoord 0, 0, AttrMap + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + xor a + call ByteFill + ld hl, UnknBGPals + ld c, 4 tiles +.load_white_palettes + ld a, (palred 31 + palgreen 31 + palblue 31) % $100 + ld [hli], a + ld a, (palred 31 + palgreen 31 + palblue 31) / $100 + ld [hli], a + dec c + jr nz, .load_white_palettes + xor a + ld [hSCY], a + ld [hSCX], a + call EnableLCD + call WaitBGMap2 + call SetPalettes + ret + +ResetDisplayBetweenHallOfFameMons: ; 4e906 + ld a, [rSVBK] + push af + ld a, $6 + ld [rSVBK], a + ld hl, wDecompressScratch + ld bc, wScratchAttrMap - wDecompressScratch + ld a, " " + call ByteFill + hlbgcoord 0, 0 + ld de, wDecompressScratch + ld b, 0 + ld c, 4 tiles + call Request2bpp + pop af + ld [rSVBK], a + ret diff --git a/engine/init_list.asm b/engine/init_list.asm new file mode 100644 index 000000000..e2b7235ab --- /dev/null +++ b/engine/init_list.asm @@ -0,0 +1,54 @@ +InitList: ; 50db9 + ld a, [wInitListType] + + cp INIT_ENEMYOT_LIST + jr nz, .check_party_ot_name + ld hl, OTPartyCount + ld de, OTPartyMonOT + ld a, ENEMY_OT_NAME + jr .done + +.check_party_ot_name + cp INIT_PLAYEROT_LIST + jr nz, .check_mon_name + ld hl, PartyCount + ld de, PartyMonOT + ld a, PARTY_OT_NAME + jr .done + +.check_mon_name + cp INIT_MON_LIST + jr nz, .check_item_name + ld hl, CurMart + ld de, PokemonNames + ld a, PKMN_NAME + jr .done + +.check_item_name + cp INIT_BAG_ITEM_LIST + jr nz, .check_ob_item_name + ld hl, NumItems + ld de, ItemNames + ld a, ITEM_NAME + jr .done + +.check_ob_item_name + ld hl, CurMart + ld de, ItemNames + ld a, ITEM_NAME +.done + ld [wNamedObjectTypeBuffer], a + ld a, l + ld [wListPointer], a + ld a, h + ld [wListPointer + 1], a + ld a, e + ld [wUnusedD102], a + ld a, d + ld [wUnusedD102 + 1], a + ld bc, ItemAttributes + ld a, c + ld [wItemAttributesPtr], a + ld a, b + ld [wItemAttributesPtr + 1], a + ret diff --git a/engine/init_map.asm b/engine/init_map.asm new file mode 100644 index 000000000..5dd6c7b8a --- /dev/null +++ b/engine/init_map.asm @@ -0,0 +1,103 @@ +ReanchorBGMap_NoOAMUpdate:: ; 6454 + call DelayFrame + ld a, [hOAMUpdate] + push af + + ld a, $1 + ld [hOAMUpdate], a + ld a, [hBGMapMode] + push af + xor a + ld [hBGMapMode], a + + call .ReanchorBGMap + + pop af + ld [hBGMapMode], a + pop af + ld [hOAMUpdate], a + ld hl, VramState + set 6, [hl] + ret + +.ReanchorBGMap: + xor a + ld [hLCDCPointer], a + ld [hBGMapMode], a + ld a, $90 + ld [hWY], a + call OverworldTextModeSwitch + ld a, VBGMap1 / $100 + call .LoadBGMapAddrIntoHRAM + call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + callba LoadOW_BGPal7 + callba ApplyPals + ld a, $1 + ld [hCGBPalUpdate], a + xor a + ld [hBGMapMode], a + ld [hWY], a + callba HDMATransfer_FillBGMap0WithBlack ; no need to farcall + ld a, VBGMap0 / $100 + call .LoadBGMapAddrIntoHRAM + xor a + ld [wBGMapAnchor], a + ld a, VBGMap0 / $100 + ld [wBGMapAnchor + 1], a + xor a + ld [hSCX], a + ld [hSCY], a + call ApplyBGMapAnchorToObjects + ret + +.LoadBGMapAddrIntoHRAM: ; 64b9 + ld [hBGMapAddress + 1], a + xor a + ld [hBGMapAddress], a + ret + +LoadFonts_NoOAMUpdate:: ; 64bf + ld a, [hOAMUpdate] + push af + ld a, $1 + ld [hOAMUpdate], a + + call .LoadGFX + + pop af + ld [hOAMUpdate], a + ret + +.LoadGFX: + call LoadFontsExtra + ld a, $90 + ld [hWY], a + call SafeUpdateSprites + call LoadStandardFont + ret + +HDMATransfer_FillBGMap0WithBlack: ; 64db + ld a, [rSVBK] + push af + ld a, $6 + ld [rSVBK], a + + ld a, "" ; $60 + ld hl, wDecompressScratch + ld bc, wScratchAttrMap - wDecompressScratch + call ByteFill + ld a, wDecompressScratch / $100 + ld [rHDMA1], a + ld a, wDecompressScratch % $100 + ld [rHDMA2], a + ld a, (VBGMap0 % $8000) / $100 + ld [rHDMA3], a + ld a, (VBGMap0 % $8000) % $100 + ld [rHDMA4], a + ld a, $3f + ld [hDMATransfer], a + call DelayFrame + + pop af + ld [rSVBK], a + ret diff --git a/items/item_effects.asm b/engine/item_effects.asm similarity index 99% rename from items/item_effects.asm rename to engine/item_effects.asm index 562bf873c..e881f6338 100644 --- a/items/item_effects.asm +++ b/engine/item_effects.asm @@ -14,6 +14,7 @@ _DoItemEffect:: ; e722 ItemEffects: ; e73c +; entries correspond to item ids (see constants/item_constants.asm) dw MasterBall dw UltraBall dw Brightpowder @@ -451,6 +452,10 @@ ParkBall: ; e8a2 ld a, [hl] push af set SUBSTATUS_TRANSFORMED, [hl] + +; This code is buggy. Any wild Pokémon that has Transformed will be +; caught as a Ditto, even if it was something else like Mew. +; To fix, do not set [TempEnemyMonSpecies] to DITTO. bit SUBSTATUS_TRANSFORMED, a jr nz, .ditto jr .not_ditto @@ -634,7 +639,7 @@ ParkBall: ; e8a2 ld a, [CurItem] cp FRIEND_BALL jr nz, .SkipBoxMonFriendBall - ; Bug: overwrites the happiness of the first mon in the box! + ; The captured mon is now first in the box ld a, FRIEND_BALL_HAPPINESS ld [sBoxMon1Happiness], a .SkipBoxMonFriendBall: @@ -2398,7 +2403,7 @@ PokeFlute: ; f50c call PrintText ld a, [Danger] - and $80 + and 1 << DANGER_ON_F jr nz, .dummy2 .dummy2 ld hl, .AllSleepingMonWokeUp @@ -3310,4 +3315,4 @@ GetMthMoveOfCurrentMon: ; f969 ret ; f971 -INCLUDE "items/pokeball_wobble.asm" +INCLUDE "engine/pokeball_wobble.asm" diff --git a/engine/knows_move.asm b/engine/knows_move.asm new file mode 100644 index 000000000..4ec3da347 --- /dev/null +++ b/engine/knows_move.asm @@ -0,0 +1,25 @@ +KnowsMove: ; f9ea + ld a, MON_MOVES + call GetPartyParamLocation + ld a, [wPutativeTMHMMove] + ld b, a + ld c, NUM_MOVES +.loop + ld a, [hli] + cp b + jr z, .knows_move + dec c + jr nz, .loop + and a + ret + +.knows_move + ld hl, .Text_knows + call PrintText + scf + ret + +.Text_knows: ; 0xfa06 + ; knows @ . + text_jump UnknownText_0x1c5ea8 + db "@" diff --git a/engine/landmarks.asm b/engine/landmarks.asm index 5e904eae8..75605bbd9 100644 --- a/engine/landmarks.asm +++ b/engine/landmarks.asm @@ -47,7 +47,7 @@ GetLandmarkName:: ; 0x1ca8a5 ; 0x1ca8c3 -INCLUDE "data/landmarks.asm" +INCLUDE "data/maps/landmarks.asm" RegionCheck: ; 0x1caea1 diff --git a/engine/link.asm b/engine/link.asm index 7bca8b891..619d5bae3 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -2034,7 +2034,7 @@ Function28f09: ; 28f09 ret ; 28f24 -INCLUDE "engine/trade/animation.asm" +INCLUDE "engine/trade_animation.asm" Special_CheckTimeCapsuleCompatibility: ; 29bfb ; Checks to see if your Party is compatible with the generation 1 games. Returns the following in ScriptVar: @@ -2577,7 +2577,18 @@ Special_CableClubCheckWhichChris: ; 29f47 ret ; 29f54 -GFX_29f54: ; 29f54 +UnusedGen1LinkCommsBorderGFX: ; 29f54 ; unreferenced -INCBIN "gfx/unknown/unused_border.2bpp" +INCBIN "gfx/trade/unused_gen_1_border_tiles.2bpp" ; 29fe4 + +Function29fe4: ; unreferenced + ld a, BANK(sPartyMail) + call GetSRAMBank + ld d, $0 + ld b, CHECK_FLAG + predef FlagPredef + call CloseSRAM + ld a, c + and a + ret diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 162ea22df..4b8adb75f 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -1,7 +1,5 @@ - INCLUDE "data/facings.asm" - INCLUDE "data/map_objects.asm" diff --git a/engine/map_objects_2.asm b/engine/map_objects_2.asm new file mode 100644 index 000000000..3c9a9773c --- /dev/null +++ b/engine/map_objects_2.asm @@ -0,0 +1,70 @@ +LoadObjectMasks: ; 2454f + ld hl, wObjectMasks + xor a + ld bc, NUM_OBJECTS + call ByteFill + nop + ld bc, MapObjects + ld de, wObjectMasks + xor a +.loop + push af + push bc + push de + call GetObjectTimeMask + jr c, .next + call CheckObjectFlag +.next + pop de + ld [de], a + inc de + pop bc + ld hl, OBJECT_LENGTH + add hl, bc + ld b, h + ld c, l + pop af + inc a + cp NUM_OBJECTS + jr nz, .loop + ret + +CheckObjectFlag: ; 2457d (9:457d) + ld hl, MAPOBJECT_SPRITE + add hl, bc + ld a, [hl] + and a + jr z, .masked + ld hl, MAPOBJECT_EVENT_FLAG + add hl, bc + ld a, [hli] + ld e, a + ld a, [hl] + ld d, a + cp -1 + jr nz, .check + ld a, e + cp -1 + jr z, .unmasked + jr .masked +.check + ld b, CHECK_FLAG + call EventFlagAction + ld a, c + and a + jr nz, .masked +.unmasked + xor a + ret + +.masked + ld a, -1 + scf + ret + +GetObjectTimeMask: ; 245a7 (9:45a7) + call CheckObjectTime + ld a, -1 + ret c + xor a + ret diff --git a/engine/map_palettes.asm b/engine/map_palettes.asm new file mode 100644 index 000000000..ffeef7bf6 --- /dev/null +++ b/engine/map_palettes.asm @@ -0,0 +1,86 @@ +SwapTextboxPalettes:: ; 4c000 + hlcoord 0, 0 + decoord 0, 0, AttrMap + ld b, SCREEN_HEIGHT +.loop + push bc + ld c, SCREEN_WIDTH +.innerloop + ld a, [hl] + push hl + srl a + jr c, .UpperNybble + ld hl, TilesetPalettes + add [hl] + ld l, a + ld a, [TilesetPalettes + 1] + adc $0 + ld h, a + ld a, [hl] + and $f + jr .next + +.UpperNybble: + ld hl, TilesetPalettes + add [hl] + ld l, a + ld a, [TilesetPalettes + 1] + adc $0 + ld h, a + ld a, [hl] + swap a + and $f + +.next + pop hl + ld [de], a + res 7, [hl] + inc hl + inc de + dec c + jr nz, .innerloop + pop bc + dec b + jr nz, .loop + ret + +ScrollBGMapPalettes:: ; 4c03f + ld hl, BGMapBuffer + ld de, BGMapPalBuffer +.loop + ld a, [hl] + push hl + srl a + jr c, .UpperNybble + +; .LowerNybble + ld hl, TilesetPalettes + add [hl] + ld l, a + ld a, [TilesetPalettes + 1] + adc $0 + ld h, a + ld a, [hl] + and $f + jr .next + +.UpperNybble: + ld hl, TilesetPalettes + add [hl] + ld l, a + ld a, [TilesetPalettes + 1] + adc $0 + ld h, a + ld a, [hl] + swap a + and $f + +.next + pop hl + ld [de], a + res 7, [hl] + inc hl + inc de + dec c + jr nz, .loop + ret diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 5de4f30da..72fe9c07f 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -356,7 +356,7 @@ CheckReplaceKrisSprite: ; 154f7 ld a, [PlayerState] cp PLAYER_NORMAL jr z, .nope - cp PLAYER_SLIP + cp PLAYER_SKATE jr z, .nope cp PLAYER_SURF jr z, .surfing diff --git a/engine/mart.asm b/engine/mart.asm index 6bcec4c55..b091c9ef1 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -99,23 +99,7 @@ RooftopSale: ; 15ac4 ret ; 15aee -RooftopSaleData1: ; 15aee - db 5 - dbw POKE_BALL, 150 - dbw GREAT_BALL, 500 - dbw SUPER_POTION, 500 - dbw FULL_HEAL, 500 - dbw REVIVE, 1200 - db -1 -RooftopSaleData2: ; 15aff - db 5 - dbw HYPER_POTION, 1000 - dbw FULL_RESTORE, 2000 - dbw FULL_HEAL, 500 - dbw ULTRA_BALL, 1000 - dbw PROTEIN, 7800 - db -1 -; 15b10 +INCLUDE "data/items/rooftop_sale.asm" LoadMartPointer: ; 15b10 ld a, b @@ -355,15 +339,7 @@ ReadMart: ; 15c25 ret ; 15c51 -BargainShopData: ; 15c51 - db 5 - dbw NUGGET, 4500 - dbw PEARL, 650 - dbw BIG_PEARL, 3500 - dbw STARDUST, 900 - dbw STAR_PIECE, 4600 - db -1 -; 15c62 +INCLUDE "data/items/bargain_shop.asm" BuyMenu: ; 15c62 diff --git a/engine/menu_2.asm b/engine/menu_2.asm new file mode 100644 index 000000000..13568f3c5 --- /dev/null +++ b/engine/menu_2.asm @@ -0,0 +1,263 @@ +PlaceMenuItemName: ; 0x24ab4 + push de + ld a, [MenuSelection] + ld [wNamedObjectIndexBuffer], a + call GetItemName + pop hl + call PlaceString + ret + +PlaceMenuItemQuantity: ; 0x24ac3 + push de + ld a, [MenuSelection] + ld [CurItem], a + callba _CheckTossableItem + ld a, [wItemAttributeParamBuffer] + pop hl + and a + jr nz, .done + ld de, $15 + add hl, de + ld [hl], "×" + inc hl + ld de, MenuSelectionQuantity + lb bc, 1, 2 + call PrintNum + +.done + ret + +PlaceMoneyTopRight: ; 24ae8 + ld hl, MenuDataHeader_0x24b15 + call CopyMenuDataHeader + jr PlaceMoneyDataHeader + +PlaceMoneyBottomLeft: ; 24af0 + ld hl, MenuDataHeader_0x24b1d + call CopyMenuDataHeader + jr PlaceMoneyDataHeader + +PlaceMoneyAtTopLeftOfTextbox: ; 24af8 + ld hl, MenuDataHeader_0x24b15 + lb de, 0, 11 + call OffsetMenuDataHeader + +PlaceMoneyDataHeader: ; 24b01 + call MenuBox + call MenuBoxCoord2Tile + ld de, SCREEN_WIDTH + 1 + add hl, de + ld de, Money + lb bc, PRINTNUM_MONEY | 3, 6 + call PrintNum + ret + +MenuDataHeader_0x24b15: ; 0x24b15 + db $40 ; flags + db 00, 11 ; start coords + db 02, 19 ; end coords + dw NULL + db 1 ; default option + +MenuDataHeader_0x24b1d: ; 0x24b1d + db $40 ; flags + db 11, 00 ; start coords + db 13, 08 ; end coords + dw NULL + db 1 ; default option + +Special_DisplayCoinCaseBalance: ; 24b25 + ; Place a text box of size 1x7 at 11, 0. + hlcoord 11, 0 + ld b, 1 + ld c, 7 + call TextBox + hlcoord 12, 0 + ld de, CoinString + call PlaceString + hlcoord 17, 1 + ld de, ShowMoney_TerminatorString + call PlaceString + ld de, Coins + lb bc, 2, 4 + hlcoord 13, 1 + call PrintNum + ret + +Special_DisplayMoneyAndCoinBalance: ; 24b4e + hlcoord 5, 0 + ld b, 3 + ld c, 13 + call TextBox + hlcoord 6, 1 + ld de, MoneyString + call PlaceString + hlcoord 12, 1 + ld de, Money + lb bc, PRINTNUM_MONEY | 3, 6 + call PrintNum + hlcoord 6, 3 + ld de, CoinString + call PlaceString + hlcoord 15, 3 + ld de, Coins + lb bc, 2, 4 + call PrintNum + ret + +MoneyString: ; 24b83 + db "MONEY@" +CoinString: ; 24b89 + db "COIN@" +ShowMoney_TerminatorString: ; 24b8e + db "@" + +Function24b8f: ; 24b8f +; unreferenced, related to safari? + ld hl, Options + ld a, [hl] + push af + set NO_TEXT_SCROLL, [hl] + hlcoord 0, 0 + ld b, 3 + ld c, 7 + call TextBox + hlcoord 1, 1 + ld de, wSafariTimeRemaining + lb bc, 2, 3 + call PrintNum + hlcoord 4, 1 + ld de, .slash_500 + call PlaceString + hlcoord 1, 3 + ld de, .booru_ko + call PlaceString + hlcoord 5, 3 + ld de, wSafariBallsRemaining + lb bc, 1, 2 + call PrintNum + pop af + ld [Options], a + ret + +.slash_500 ; 24bcf + db "/500@" +.booru_ko ; 24bd4 + db "ボール こ@" + +StartMenu_DrawBugContestStatusBox: ; 24bdc + hlcoord 0, 0 + ld b, 5 + ld c, 17 + call TextBox + ret + +StartMenu_PrintBugContestStatus: ; 24be7 + ld hl, Options + ld a, [hl] + push af + set NO_TEXT_SCROLL, [hl] + call StartMenu_DrawBugContestStatusBox + hlcoord 1, 5 + ld de, .Balls_EN + call PlaceString + hlcoord 8, 5 + ld de, wParkBallsRemaining + lb bc, PRINTNUM_RIGHTALIGN | 1, 2 + call PrintNum + hlcoord 1, 1 + ld de, .CAUGHT + call PlaceString + ld a, [wContestMon] + and a + ld de, .None + jr z, .no_contest_mon + ld [wd265], a + call GetPokemonName + +.no_contest_mon + hlcoord 8, 1 + call PlaceString + ld a, [wContestMon] + and a + jr z, .skip_level + hlcoord 1, 3 + ld de, .LEVEL + call PlaceString + ld a, [wContestMonLevel] + ld h, b + ld l, c + inc hl + ld c, 3 + call Print8BitNumRightAlign + +.skip_level + pop af + ld [Options], a + ret + +.Balls_JP: ; 24c43 + db "ボール こ@" +.CAUGHT: ; 24c4b + db "CAUGHT@" +.Balls_EN: ; 24c52 + db "BALLS:@" +.None: ; 24c59 + db "None@" +.LEVEL: ; 24c5e + db "LEVEL@" + +FindApricornsInBag: ; 24c64 +; Checks the bag for Apricorns. + ld hl, Buffer1 + xor a + ld [hli], a + dec a + ld bc, 10 + call ByteFill + + ld hl, .ApricornBalls +.loop + ld a, [hl] + cp -1 + jr z, .done + push hl + ld [CurItem], a + ld hl, NumItems + call CheckItem + pop hl + jr nc, .nope + ld a, [hl] + call .addtobuffer +.nope + inc hl + inc hl + jr .loop + +.done + ld a, [Buffer1] + and a + ret nz + scf + ret + +.addtobuffer ; 24c94 + push hl + ld hl, Buffer1 + inc [hl] + ld e, [hl] + ld d, 0 + add hl, de + ld [hl], a + pop hl + ret + +.ApricornBalls: ; 24ca0 + db RED_APRICORN, LEVEL_BALL + db BLU_APRICORN, LURE_BALL + db YLW_APRICORN, MOON_BALL + db GRN_APRICORN, FRIEND_BALL + db WHT_APRICORN, FAST_BALL + db BLK_APRICORN, HEAVY_BALL + db PNK_APRICORN, LOVE_BALL + db -1 diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm index 70c439863..18dc4f94b 100755 --- a/engine/mon_icons.asm +++ b/engine/mon_icons.asm @@ -466,7 +466,7 @@ ReadMonMenuIcon: ; 8eab3 ; 8eac4 -INCLUDE "data/mon_menu_icons.asm" +INCLUDE "data/pokemon/menu_icons.asm" INCLUDE "gfx/icon_pointers.asm" diff --git a/engine/mon_stats.asm b/engine/mon_stats.asm new file mode 100644 index 000000000..ec468be16 --- /dev/null +++ b/engine/mon_stats.asm @@ -0,0 +1,486 @@ +DrawPlayerHP: ; 50b0a + ld a, $1 + jr DrawHP + +DrawEnemyHP: ; 50b0e + ld a, $2 + +DrawHP: ; 50b10 + ld [wWhichHPBar], a + push hl + push bc + ; box mons have full HP + ld a, [MonType] + cp BOXMON + jr z, .at_least_1_hp + + ld a, [TempMonHP] + ld b, a + ld a, [TempMonHP + 1] + ld c, a + +; Any HP? + or b + jr nz, .at_least_1_hp + + xor a + ld c, a + ld e, a + ld a, 6 + ld d, a + jp .fainted + +.at_least_1_hp + ld a, [TempMonMaxHP] + ld d, a + ld a, [TempMonMaxHP + 1] + ld e, a + ld a, [MonType] + cp BOXMON + jr nz, .not_boxmon + + ld b, d + ld c, e + +.not_boxmon + predef ComputeHPBarPixels + ld a, 6 + ld d, a + ld c, a + +.fainted + ld a, c + pop bc + ld c, a + pop hl + push de + push hl + push hl + call DrawBattleHPBar + pop hl + +; Print HP + bccoord 1, 1, 0 + add hl, bc + ld de, TempMonHP + ld a, [MonType] + cp BOXMON + jr nz, .not_boxmon_2 + ld de, TempMonMaxHP +.not_boxmon_2 + lb bc, 2, 3 + call PrintNum + + ld a, "/" + ld [hli], a + +; Print max HP + ld de, TempMonMaxHP + lb bc, 2, 3 + call PrintNum + pop hl + pop de + ret + +PrintTempMonStats: ; 50b7b +; Print TempMon's stats at hl, with spacing bc. + push bc + push hl + ld de, .StatNames + call PlaceString + pop hl + pop bc + add hl, bc + ld bc, SCREEN_WIDTH + add hl, bc + ld de, TempMonAttack + lb bc, 2, 3 + call .PrintStat + ld de, TempMonDefense + call .PrintStat + ld de, TempMonSpclAtk + call .PrintStat + ld de, TempMonSpclDef + call .PrintStat + ld de, TempMonSpeed + jp PrintNum + +.PrintStat: ; 50bab + push hl + call PrintNum + pop hl + ld de, SCREEN_WIDTH * 2 + add hl, de + ret + +.StatNames: ; 50bb5 + db "ATTACK" + next "DEFENSE" + next "SPCL.ATK" + next "SPCL.DEF" + next "SPEED" + next "@" + +GetGender: ; 50bdd +; Return the gender of a given monster (CurPartyMon/CurOTMon/CurWildMon). +; When calling this function, a should be set to an appropriate MonType value. + +; return values: +; a = 1: f = nc|nz; male +; a = 0: f = nc|z; female +; f = c: genderless + +; This is determined by comparing the Attack and Speed DVs +; with the species' gender ratio. + +; Figure out what type of monster struct we're looking at. + +; 0: PartyMon + ld hl, PartyMon1DVs + ld bc, PARTYMON_STRUCT_LENGTH + ld a, [MonType] + and a + jr z, .PartyMon + +; 1: OTPartyMon + ld hl, OTPartyMon1DVs + dec a + jr z, .PartyMon + +; 2: sBoxMon + ld hl, sBoxMon1DVs + ld bc, BOXMON_STRUCT_LENGTH + dec a + jr z, .sBoxMon + +; 3: Unknown + ld hl, TempMonDVs + dec a + jr z, .DVs + +; else: WildMon + ld hl, EnemyMonDVs + jr .DVs + +; Get our place in the party/box. + +.PartyMon: +.sBoxMon + ld a, [CurPartyMon] + call AddNTimes + +.DVs: + +; sBoxMon data is read directly from SRAM. + ld a, [MonType] + cp BOXMON + ld a, 1 + call z, GetSRAMBank + +; Attack DV + ld a, [hli] + and $f0 + ld b, a +; Speed DV + ld a, [hl] + and $f0 + swap a + +; Put our DVs together. + or b + ld b, a + +; Close SRAM if we were dealing with a sBoxMon. + ld a, [MonType] + cp BOXMON + call z, CloseSRAM + +; We need the gender ratio to do anything with this. + push bc + ld a, [CurPartySpecies] + dec a + ld hl, BaseData + BASE_GENDER + ld bc, BASE_DATA_SIZE + call AddNTimes + pop bc + + ld a, BANK(BaseData) + call GetFarByte + +; The higher the ratio, the more likely the monster is to be female. + + cp GENDERLESS + jr z, .Genderless + + and a ; GENDER_F0? + jr z, .Male + + cp GENDER_F100 + jr z, .Female + +; Values below the ratio are male, and vice versa. + cp b + jr c, .Male + +.Female: + xor a + ret + +.Male: + ld a, 1 + and a + ret + +.Genderless: + scf + ret + +ListMovePP: ; 50c50 + ld a, [wNumMoves] + inc a + ld c, a + ld a, NUM_MOVES + sub c + ld b, a + push hl + ld a, [Buffer1] + ld e, a + ld d, $0 + ld a, $3e ; P + call .load_loop + ld a, b + and a + jr z, .skip + ld c, a + ld a, "-" + call .load_loop + +.skip + pop hl + inc hl + inc hl + inc hl + ld d, h + ld e, l + ld hl, TempMonMoves + ld b, 0 +.loop + ld a, [hli] + and a + jr z, .done + push bc + push hl + push de + ld hl, wMenuCursorY + ld a, [hl] + push af + ld [hl], b + push hl + callab GetMaxPPOfMove + pop hl + pop af + ld [hl], a + pop de + pop hl + push hl + ld bc, TempMonPP - (TempMonMoves + 1) + add hl, bc + ld a, [hl] + and $3f + ld [StringBuffer1 + 4], a + ld h, d + ld l, e + push hl + ld de, StringBuffer1 + 4 + lb bc, 1, 2 + call PrintNum + ld a, "/" + ld [hli], a + ld de, wd265 + lb bc, 1, 2 + call PrintNum + pop hl + ld a, [Buffer1] + ld e, a + ld d, 0 + add hl, de + ld d, h + ld e, l + pop hl + pop bc + inc b + ld a, b + cp NUM_MOVES + jr nz, .loop + +.done + ret + +.load_loop ; 50cc9 + ld [hli], a + ld [hld], a + add hl, de + dec c + jr nz, .load_loop + ret + +Function50cd0: ; 50cd0 +; XXX +.loop + ld [hl], $32 + inc hl + ld [hl], $3e + dec hl + add hl, de + dec c + jr nz, .loop + ret + +Predef22: ; unreferenced predef + push hl + push hl + ld hl, PartyMonNicknames + ld a, [CurPartyMon] + call GetNick + pop hl + call PlaceString + call CopyPkmnToTempMon + pop hl + ld a, [CurPartySpecies] + cp EGG + jr z, .egg + push hl + ld bc, -12 + add hl, bc + ld b, $0 + call DrawEnemyHP + pop hl + ld bc, 5 + add hl, bc + push de + call PrintLevel + pop de + +.egg + ret + +PlaceStatusString: ; 50d0a + push de + inc de + inc de + ld a, [de] + ld b, a + inc de + ld a, [de] + or b + pop de + jr nz, PlaceNonFaintStatus + push de + ld de, FntString + call CopyStatusString + pop de + ld a, $1 + and a + ret + +FntString: ; 50d22 + db "FNT@" + +CopyStatusString: ; 50d25 + ld a, [de] + inc de + ld [hli], a + ld a, [de] + inc de + ld [hli], a + ld a, [de] + ld [hl], a + ret + +PlaceNonFaintStatus: ; 50d2e + push de + ld a, [de] + ld de, PsnString + bit PSN, a + jr nz, .place + ld de, BrnString + bit BRN, a + jr nz, .place + ld de, FrzString + bit FRZ, a + jr nz, .place + ld de, ParString + bit PAR, a + jr nz, .place + ld de, SlpString + and SLP + jr z, .no_status + +.place + call CopyStatusString + ld a, $1 + and a + +.no_status + pop de + ret + +SlpString: db "SLP@" +PsnString: db "PSN@" +BrnString: db "BRN@" +FrzString: db "FRZ@" +ParString: db "PAR@" + +ListMoves: ; 50d6f +; List moves at hl, spaced every [Buffer1] tiles. + ld de, wListMoves_MoveIndicesBuffer + ld b, $0 +.moves_loop + ld a, [de] + inc de + and a + jr z, .no_more_moves + push de + push hl + push hl + ld [CurSpecies], a + ld a, MOVE_NAME + ld [wNamedObjectTypeBuffer], a + call GetName + ld de, StringBuffer1 + pop hl + push bc + call PlaceString + pop bc + ld a, b + ld [wNumMoves], a + inc b + pop hl + push bc + ld a, [Buffer1] + ld c, a + ld b, 0 + add hl, bc + pop bc + pop de + ld a, b + cp NUM_MOVES + jr z, .done + jr .moves_loop + +.no_more_moves + ld a, b +.nonmove_loop + push af + ld [hl], "-" + ld a, [Buffer1] + ld c, a + ld b, 0 + add hl, bc + pop af + inc a + cp NUM_MOVES + jr nz, .nonmove_loop + +.done + ret diff --git a/engine/mysterygift.asm b/engine/mystery_gift.asm similarity index 100% rename from engine/mysterygift.asm rename to engine/mystery_gift.asm diff --git a/engine/mysterygift2.asm b/engine/mystery_gift_2.asm similarity index 100% rename from engine/mysterygift2.asm rename to engine/mystery_gift_2.asm diff --git a/engine/new_pokedex_entry.asm b/engine/new_pokedex_entry.asm new file mode 100644 index 000000000..012052530 --- /dev/null +++ b/engine/new_pokedex_entry.asm @@ -0,0 +1,52 @@ +NewPokedexEntry: ; fb877 + ld a, [hMapAnims] + push af + xor a + ld [hMapAnims], a + call LowVolume + call ClearBGPalettes + call ClearTileMap + call UpdateSprites + call ClearSprites + ld a, [wPokedexStatus] + push af + ld a, [hSCX] + add $5 + ld [hSCX], a + xor a + ld [wPokedexStatus], a + callba _NewPokedexEntry + call WaitPressAorB_BlinkCursor + ld a, $1 + ld [wPokedexStatus], a + callba DisplayDexEntry + call WaitPressAorB_BlinkCursor + pop af + ld [wPokedexStatus], a + call MaxVolume + call RotateThreePalettesRight + ld a, [hSCX] + add -5 ; 251 ; NUM_POKEMON + ld [hSCX], a + call .ReturnFromDexRegistration + pop af + ld [hMapAnims], a + ret +; fb8c8 + +.ReturnFromDexRegistration: ; fb8c8 + call ClearTileMap + call LoadFontsExtra + call LoadStandardFont + callba Pokedex_PlaceFrontpicTopLeftCorner + call WaitBGMap2 + callba GetEnemyMonDVs + ld a, [hli] + ld [TempMonDVs], a + ld a, [hl] + ld [TempMonDVs + 1], a + ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS + call GetSGBLayout + call SetPalettes + ret +; fb8f1 diff --git a/engine/npc_movement.asm b/engine/npc_movement.asm index 9a18cdcb1..e102cc554 100755 --- a/engine/npc_movement.asm +++ b/engine/npc_movement.asm @@ -7,7 +7,8 @@ Function6ec1: ; 6ec1 ld hl, OBJECT_FLAGS1 add hl, bc - bit 4, [hl] ; lost + bit 4, [hl] ; lost, uncomment next line to fix +; jr nz, .resume push hl push bc call Function6f2c diff --git a/engine/overworld.asm b/engine/overworld.asm index 73115e479..a085d1d5a 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -389,8 +389,8 @@ AddSpriteGFX: ; 142e5 LoadSpriteGFX: ; 14306 -; Bug: b is not preserved, so -; it's useless as a next count. +; Bug: b is not preserved, so it's useless as a next count. +; Uncomment the lines below to fix. ld hl, UsedSprites ld b, SPRITE_GFX_LIST_CAPACITY @@ -409,7 +409,9 @@ LoadSpriteGFX: ; 14306 ret .LoadSprite: + ; push bc call GetSprite + ; pop bc ld a, l ret ; 1431e @@ -721,6 +723,6 @@ INCLUDE "data/emote_headers.asm" INCLUDE "data/sprite_mons.asm" -INCLUDE "data/outdoor_sprites.asm" +INCLUDE "data/maps/outdoor_sprites.asm" INCLUDE "gfx/sprite_headers.asm" diff --git a/engine/pack.asm b/engine/pack.asm index e10b70e12..858548771 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -1315,10 +1315,10 @@ DrawPackGFX: ; 1089d ; 108cc PackGFXPointers: ; 108cc - dw PackGFX + $f0 * 1 - dw PackGFX + $f0 * 3 - dw PackGFX + $f0 * 0 - dw PackGFX + $f0 * 2 + dw PackGFX + (15 tiles) * 1 + dw PackGFX + (15 tiles) * 3 + dw PackGFX + (15 tiles) * 0 + dw PackGFX + (15 tiles) * 2 ; 108d4 Pack_InterpretJoypad: ; 108d4 (4:48d4) diff --git a/engine/pack_f.asm b/engine/pack_f.asm new file mode 100644 index 000000000..f71e43db8 --- /dev/null +++ b/engine/pack_f.asm @@ -0,0 +1,20 @@ +DrawKrisPackGFX: ; 48e81 + ld hl, PackFGFXPointers + add hl, de + add hl, de + ld a, [hli] + ld e, a + ld d, [hl] + ld hl, VTiles2 tile $50 + lb bc, BANK(PackFGFX), 15 + call Request2bpp + ret + +PackFGFXPointers: ; 48e93 + dw PackFGFX + (15 tiles) * 1 + dw PackFGFX + (15 tiles) * 3 + dw PackFGFX + (15 tiles) * 0 + dw PackFGFX + (15 tiles) * 2 + +PackFGFX: ; 48e9b +INCBIN "gfx/pack/pack_f.2bpp" diff --git a/engine/place_graphics.asm b/engine/place_graphics.asm new file mode 100644 index 000000000..d72364776 --- /dev/null +++ b/engine/place_graphics.asm @@ -0,0 +1,56 @@ +PlaceGraphic: ; 2ef6e +; Fill wBoxAlignment-aligned box width b height c +; with iterating tile starting from hGraphicStartTile at hl. +; Predef $13 + + ld de, SCREEN_WIDTH + + ld a, [wBoxAlignment] + and a + jr nz, .right + + ld a, [hGraphicStartTile] +.x1 + push bc + push hl + +.y1 + ld [hl], a + add hl, de + inc a + dec c + jr nz, .y1 + + pop hl + inc hl + pop bc + dec b + jr nz, .x1 + ret + +.right +; Right-aligned. + push bc + ld b, 0 + dec c + add hl, bc + pop bc + + ld a, [hGraphicStartTile] +.x2 + push bc + push hl + +.y2 + ld [hl], a + add hl, de + inc a + dec c + jr nz, .y2 + + pop hl + dec hl + pop bc + dec b + jr nz, .x2 + ret diff --git a/engine/play_slow_cry.asm b/engine/play_slow_cry.asm new file mode 100644 index 000000000..322fd21cc --- /dev/null +++ b/engine/play_slow_cry.asm @@ -0,0 +1,31 @@ +PlaySlowCry: ; fb841 + ld a, [ScriptVar] + call LoadCryHeader + jr c, .done + + ld hl, CryPitch + ld a, [hli] + ld h, [hl] + ld l, a + ld bc, -$140 + add hl, bc + ld a, l + ld [CryPitch], a + ld a, h + ld [CryPitch + 1], a + ld hl, CryLength + ld a, [hli] + ld h, [hl] + ld l, a + ld bc, $60 + add hl, bc + ld a, l + ld [CryLength], a + ld a, h + ld [CryLength + 1], a + callba _PlayCryHeader + call WaitSFX + +.done + ret +; fb877 diff --git a/engine/player_gfx.asm b/engine/player_gfx.asm new file mode 100644 index 000000000..1af444d73 --- /dev/null +++ b/engine/player_gfx.asm @@ -0,0 +1,263 @@ +Function88248: ; 88248 +; XXX + ld c, CAL + ld a, [PlayerGender] + bit 0, a + jr z, .okay + ld c, KAREN + +.okay + ld a, c + ld [TrainerClass], a + ret + +MovePlayerPicRight: ; 88258 + hlcoord 6, 4 + ld de, 1 + jr MovePlayerPic + +MovePlayerPicLeft: ; 88260 + hlcoord 13, 4 + ld de, -1 + ; fallthrough + +MovePlayerPic: ; 88266 +; Move player pic at hl by de * 7 tiles. + ld c, $8 +.loop + push bc + push hl + push de + xor a + ld [hBGMapMode], a + lb bc, 7, 7 + predef PlaceGraphic + xor a + ld [hBGMapThird], a + call WaitBGMap + call DelayFrame + pop de + pop hl + add hl, de + pop bc + dec c + ret z + push hl + push bc + ld a, l + sub e + ld l, a + ld a, h + sbc d + ld h, a + lb bc, 7, 7 + call ClearBox + pop bc + pop hl + jr .loop + +ShowPlayerNamingChoices: ; 88297 + ld hl, ChrisNameMenuHeader + ld a, [PlayerGender] + bit 0, a + jr z, .GotGender + ld hl, KrisNameMenuHeader +.GotGender: + call LoadMenuDataHeader + call VerticalMenu + ld a, [wMenuCursorY] + dec a + call CopyNameFromMenu + 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 + +GetPlayerNameArray: ; 88318 This Function is never called + ld hl, PlayerName + ld de, MalePlayerNameArray + ld a, [PlayerGender] + bit 0, a + jr z, .done + ld de, FemalePlayerNameArray + +.done + call InitName + ret + +GetPlayerIcon: ; 8832c +; Get the player icon corresponding to gender + +; Male + ld de, ChrisSpriteGFX + ld b, BANK(ChrisSpriteGFX) + + ld a, [PlayerGender] + bit 0, a + jr z, .done + +; Female + ld de, KrisSpriteGFX + ld b, BANK(KrisSpriteGFX) + +.done + ret + +GetCardPic: ; 8833e + ld hl, ChrisCardPic + ld a, [PlayerGender] + bit 0, a + jr z, .GotClass + ld hl, KrisCardPic +.GotClass: + ld de, VTiles2 tile $00 + ld bc, $23 tiles + ld a, BANK(ChrisCardPic) ; BANK(KrisCardPic) + call FarCopyBytes + ld hl, CardGFX + ld de, VTiles2 tile $23 + ld bc, 6 tiles + ld a, BANK(CardGFX) + call FarCopyBytes + ret + +ChrisCardPic: ; 88365 +INCBIN "gfx/trainer_card/chris_card.2bpp" + +KrisCardPic: ; 88595 +INCBIN "gfx/trainer_card/kris_card.2bpp" + +CardGFX: ; 887c5 +INCBIN "gfx/trainer_card/trainer_card.2bpp" + +GetPlayerBackpic: ; 88825 + ld a, [PlayerGender] + bit 0, a + jr z, GetChrisBackpic + call GetKrisBackpic + ret + +GetChrisBackpic: ; 88830 + ld hl, ChrisBackpic + ld b, BANK(ChrisBackpic) + ld de, VTiles2 tile $31 + ld c, 7 * 7 + predef DecompressPredef + ret + +HOF_LoadTrainerFrontpic: ; 88840 + call WaitBGMap + xor a + ld [hBGMapMode], a + ld e, 0 + ld a, [PlayerGender] + bit 0, a + jr z, .GotClass + ld e, 1 + +.GotClass: + ld a, e + ld [TrainerClass], a + ld de, ChrisPic + ld a, [PlayerGender] + bit 0, a + jr z, .GotPic + ld de, KrisPic + +.GotPic: + ld hl, VTiles2 + ld b, BANK(ChrisPic) ; BANK(KrisPic) + ld c, 7 * 7 + call Get2bpp + call WaitBGMap + ld a, $1 + ld [hBGMapMode], a + ret + +DrawIntroPlayerPic: ; 88874 +; Draw the player pic at (6,4). + +; Get class + ld e, CHRIS + ld a, [PlayerGender] + bit 0, a + jr z, .GotClass + ld e, KRIS +.GotClass: + ld a, e + ld [TrainerClass], a + +; Load pic + ld de, ChrisPic + ld a, [PlayerGender] + bit 0, a + jr z, .GotPic + ld de, KrisPic +.GotPic: + ld hl, VTiles2 + ld b, BANK(ChrisPic) ; BANK(KrisPic) + ld c, 7 * 7 ; dimensions + call Get2bpp + +; Draw + xor a + ld [hGraphicStartTile], a + hlcoord 6, 4 + lb bc, 7, 7 + predef PlaceGraphic + ret + +ChrisPic: ; 888a9 +INCBIN "gfx/player/chris.2bpp" + +KrisPic: ; 88bb9 +INCBIN "gfx/player/kris.2bpp" + +GetKrisBackpic: ; 88ec9 +; Kris's backpic is uncompressed. + ld de, KrisBackpic + ld hl, VTiles2 tile $31 + lb bc, BANK(KrisBackpic), 7 * 7 ; dimensions + call Get2bpp + ret + +KrisBackpic: ; 88ed6 +INCBIN "gfx/player/kris_back.2bpp" diff --git a/engine/player_gfx_2.asm b/engine/player_gfx_2.asm new file mode 100644 index 000000000..d6e7791a3 --- /dev/null +++ b/engine/player_gfx_2.asm @@ -0,0 +1,5 @@ +ChrisBackpic: ; 2ba1a +INCBIN "gfx/player/chris_back.2bpp.lz" + +DudeBackpic: ; 2bbaa +INCBIN "gfx/battle/dude.2bpp.lz" diff --git a/engine/player_movement.asm b/engine/player_movement.asm index 7ccb36551..34ca81fe9 100755 --- a/engine/player_movement.asm +++ b/engine/player_movement.asm @@ -42,7 +42,7 @@ DoPlayerMovement:: ; 80000 jr z, .Surf cp PLAYER_BIKE jr z, .Normal - cp PLAYER_SLIP + cp PLAYER_SKATE jr z, .Ice .Normal: @@ -409,6 +409,8 @@ DoPlayerMovement:: ; 80000 ; making bumps silent. ld a, [WalkingDirection] + ; cp STANDING + ; jr z, .not_warp ld e, a ld d, 0 ld hl, .EdgeWarps @@ -420,6 +422,7 @@ DoPlayerMovement:: ; 80000 ld a, 1 ld [wd041], a ld a, [WalkingDirection] + ; This is in the wrong place. cp STANDING jr z, .not_warp @@ -750,11 +753,10 @@ DoPlayerMovement:: ; 80000 ; 803ca .BikeCheck: ; 803ca - ld a, [PlayerState] cp PLAYER_BIKE ret z - cp PLAYER_SLIP + cp PLAYER_SKATE ret ; 803d3 @@ -824,7 +826,7 @@ CheckStandingOnIce:: ; 80404 call CheckIceTile jr nc, .yep ld a, [PlayerState] - cp PLAYER_SLIP + cp PLAYER_SKATE jr nz, .not_ice .yep diff --git a/items/pokeball_wobble.asm b/engine/pokeball_wobble.asm similarity index 100% rename from items/pokeball_wobble.asm rename to engine/pokeball_wobble.asm diff --git a/engine/pokedex.asm b/engine/pokedex.asm index c60396a40..a7a7a4860 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -1709,9 +1709,9 @@ Pokedex_ABCMode: ; 40c30 ret -INCLUDE "data/pokedex/order_alpha.asm" +INCLUDE "data/pokemon/dex_order_alpha.asm" -INCLUDE "data/pokedex/order_new.asm" +INCLUDE "data/pokemon/dex_order_new.asm" Pokedex_DisplayModeDescription: ; 40e5b diff --git a/engine/pokedex_3.asm b/engine/pokedex_3.asm new file mode 100644 index 000000000..3414252c1 --- /dev/null +++ b/engine/pokedex_3.asm @@ -0,0 +1,162 @@ +LoadSGBPokedexGFX: ; 1ddf1c + ld hl, SGBPokedexGFX_LZ + ld de, VTiles2 tile $31 + call Decompress + ret + +LoadSGBPokedexGFX2: ; 1ddf26 (77:5f26) + ld hl, SGBPokedexGFX_LZ + ld de, VTiles2 tile $31 + lb bc, BANK(SGBPokedexGFX_LZ), $3a + call DecompressRequest2bpp + ret + +SGBPokedexGFX_LZ: ; 1ddf33 +INCBIN "gfx/pokedex/sgb.2bpp.lz" + +LoadQuestionMarkPic: ; 1de0d7 + ld hl, .QuestionMarkLZ + ld de, sScratch + call Decompress + ret + +.QuestionMarkLZ: ; 1de0e1 +INCBIN "gfx/pics/questionmark/front.2bpp.lz" + +DrawPokedexListWindow: ; 1de171 (77:6171) + ld a, $32 + hlcoord 0, 17 + ld bc, 12 + call ByteFill + hlcoord 0, 1 + lb bc, 15, 11 + call ClearBox + ld a, $34 + hlcoord 0, 0 + ld bc, 11 + call ByteFill + ld a, $39 + hlcoord 0, 16 + ld bc, 11 + call ByteFill + hlcoord 5, 0 + ld [hl], $3f + hlcoord 5, 16 + ld [hl], $40 + ld a, [wCurrentDexMode] + cp DEXMODE_OLD + jr z, .OldMode +; scroll bar + hlcoord 11, 0 + ld [hl], $50 + ld a, $51 + hlcoord 11, 1 + ld b, SCREEN_HEIGHT - 3 + call Bank77_FillColumn + ld [hl], $52 + jr .Done + +.OldMode: +; no scroll bar + hlcoord 11, 0 + ld [hl], $66 + ld a, $67 + hlcoord 11, 1 + ld b, SCREEN_HEIGHT - 3 + call Bank77_FillColumn + ld [hl], $68 +.Done: + ret + +DrawPokedexSearchResultsWindow: ; 1de1d1 (77:61d1) + ld a, $34 + hlcoord 0, 0 + ld bc, 11 + call ByteFill + ld a, $39 + hlcoord 0, 10 + ld bc, 11 + call ByteFill + hlcoord 5, 0 + ld [hl], $3f + hlcoord 5, 10 + ld [hl], $40 + hlcoord 11, 0 + ld [hl], $66 + ld a, $67 + hlcoord 11, 1 + ld b, SCREEN_HEIGHT / 2 + call Bank77_FillColumn + ld [hl], $68 + ld a, $34 + hlcoord 0, 11 + ld bc, 11 + call ByteFill + ld a, $39 + hlcoord 0, 17 + ld bc, 11 + call ByteFill + hlcoord 11, 11 + ld [hl], $66 + ld a, $67 + hlcoord 11, 12 + ld b, 5 + call Bank77_FillColumn + ld [hl], $68 + hlcoord 0, 12 + lb bc, 5, 11 + call ClearBox + ld de, .esults_D + hlcoord 0, 12 + call PlaceString + ret + +.esults_D ; 1de23c +; (SEARCH R) + db "ESULTS" + next "" +; (### FOUN) + next "D!@" + +DrawDexEntryScreenRightEdge: ; 1de247 + ld a, [hBGMapAddress] + ld l, a + ld a, [hBGMapAddress + 1] + ld h, a + push hl + inc hl + ld a, l + ld [hBGMapAddress], a + ld a, h + ld [hBGMapAddress + 1], a + hlcoord 19, 0 + ld [hl], $66 + hlcoord 19, 1 + ld a, $67 + ld b, 15 + call Bank77_FillColumn + ld [hl], $68 + hlcoord 19, 17 + ld [hl], $3c + xor a + ld b, SCREEN_HEIGHT + hlcoord 19, 0, AttrMap + call Bank77_FillColumn + call WaitBGMap2 + pop hl + ld a, l + ld [hBGMapAddress], a + ld a, h + ld [hBGMapAddress + 1], a + ret + +Bank77_FillColumn: ; 1de27f + push de + ld de, SCREEN_WIDTH +.loop + ld [hl], a + add hl, de + dec b + jr nz, .loop + pop de + ret diff --git a/engine/pokegear.asm b/engine/pokegear.asm index 561ece400..bf2c2b40e 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -2338,44 +2338,7 @@ HasVisitedSpawn: ; 91c50 ; 91c5e -Flypoints: ; 91c5e -; landmark, spawn point - const_def -flypoint: MACRO - const FLY_\1 - db \2, SPAWN_\1 -ENDM -; Johto - flypoint NEW_BARK, NEW_BARK_TOWN - flypoint CHERRYGROVE, CHERRYGROVE_CITY - flypoint VIOLET, VIOLET_CITY - flypoint AZALEA, AZALEA_TOWN - flypoint GOLDENROD, GOLDENROD_CITY - flypoint ECRUTEAK, ECRUTEAK_CITY - flypoint OLIVINE, OLIVINE_CITY - flypoint CIANWOOD, CIANWOOD_CITY - flypoint MAHOGANY, MAHOGANY_TOWN - flypoint LAKE, LAKE_OF_RAGE - flypoint BLACKTHORN, BLACKTHORN_CITY - flypoint MT_SILVER, SILVER_CAVE -; Kanto - -KANTO_FLYPOINT EQU const_value - flypoint PALLET, PALLET_TOWN - flypoint VIRIDIAN, VIRIDIAN_CITY - flypoint PEWTER, PEWTER_CITY - flypoint CERULEAN, CERULEAN_CITY - flypoint VERMILION, VERMILION_CITY - flypoint ROCK_TUNNEL, ROCK_TUNNEL - flypoint LAVENDER, LAVENDER_TOWN - flypoint CELADON, CELADON_CITY - flypoint SAFFRON, SAFFRON_CITY - flypoint FUCHSIA, FUCHSIA_CITY - flypoint CINNABAR, CINNABAR_ISLAND - flypoint INDIGO, INDIGO_PLATEAU - db -1 - -; 91c8f +INCLUDE "data/flypoints.asm" ret_91c8f: ; 91c8f ret @@ -2872,19 +2835,7 @@ TownMapPals: ; 91f13 ret .PalMap: -townmappals: MACRO -rept _NARG / 2 - dn \2, \1 - shift - shift -endr -endm - townmappals 1, 1, 1, 2, 2, 2, 0, 0, 1, 1, 3, 1, 4, 5, 4, 5 - townmappals 1, 1, 1, 2, 2, 2, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0 - townmappals 1, 1, 1, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - townmappals 0, 0, 0, 0, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 - townmappals 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0 - townmappals 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0 +INCLUDE "data/palettes/town_map.asm" ; 91f7b TownMapMon: ; 91f7b diff --git a/engine/pokegear_2.asm b/engine/pokegear_2.asm new file mode 100644 index 000000000..a5cceecfd --- /dev/null +++ b/engine/pokegear_2.asm @@ -0,0 +1,25 @@ +TownMap_ConvertLineBreakCharacters: ; 1de2c5 + ld hl, StringBuffer1 +.loop + ld a, [hl] + cp "@" + jr z, .end + cp "%" + jr z, .line_break + cp "¯" + jr z, .line_break + inc hl + jr .loop + +.line_break + ld [hl], "" + +.end + ld de, StringBuffer1 + hlcoord 9, 0 + call PlaceString + ret + + +PokegearGFX: ; 1de2e4 +INCBIN "gfx/pokegear/pokegear.2bpp.lz" diff --git a/engine/pokerus.asm b/engine/pokerus.asm new file mode 100644 index 000000000..3e5e094e4 --- /dev/null +++ b/engine/pokerus.asm @@ -0,0 +1,160 @@ +GivePokerusAndConvertBerries: ; 2ed44 + call ConvertBerriesToBerryJuice + ld hl, PartyMon1PokerusStatus + ld a, [PartyCount] + ld b, a + ld de, PARTYMON_STRUCT_LENGTH +; Check to see if any of your Pokemon already has Pokerus. +; If so, sample its spread through your party. +; This means that you cannot get Pokerus de novo while +; a party member has an active infection. +.loopMons + ld a, [hl] + and $f + jr nz, .TrySpreadPokerus + add hl, de + dec b + jr nz, .loopMons + +; If we haven't been to Goldenrod City at least once, +; prevent the contraction of Pokerus. + ld hl, StatusFlags2 + bit 6, [hl] + ret z + call Random + ld a, [hRandomAdd] + and a + ret nz + ld a, [hRandomSub] + cp $3 + ret nc ; 3/65536 chance (00 00, 00 01 or 00 02) + ld a, [PartyCount] + ld b, a +.randomMonSelectLoop + call Random + and $7 + cp b + jr nc, .randomMonSelectLoop + ld hl, PartyMon1PokerusStatus + call GetPartyLocation ; get pokerus byte of random mon + ld a, [hl] + and $f0 + ret nz ; if it already has pokerus, do nothing +.randomPokerusLoop ; Simultaneously sample the strain and duration + call Random + and a + jr z, .randomPokerusLoop + ld b, a + and $f0 + jr z, .load_pkrs + ld a, b + and $7 + inc a +.load_pkrs + ld b, a ; this should come before the label + swap b + and $3 + inc a + add b + ld [hl], a + ret + +.TrySpreadPokerus: + call Random + cp 1 + 33 percent + ret nc ; 1/3 chance + + ld a, [PartyCount] + cp 1 + ret z ; only one mon, nothing to do + + ld c, [hl] + ld a, b + cp 2 + jr c, .checkPreviousMonsLoop ; no more mons after this one, go backwards + + call Random + cp 1 + 50 percent + jr c, .checkPreviousMonsLoop ; 1/2 chance, go backwards +.checkFollowingMonsLoop + add hl, de + ld a, [hl] + and a + jr z, .infectMon + ld c, a + and $3 + ret z ; if mon has cured pokerus, stop searching + dec b ; go on to next mon + ld a, b + cp 1 + jr nz, .checkFollowingMonsLoop ; no more mons left + ret + +.checkPreviousMonsLoop + ld a, [PartyCount] + cp b + ret z ; no more mons + ld a, l + sub e + ld l, a + ld a, h + sbc d + ld h, a + ld a, [hl] + and a + jr z, .infectMon + ld c, a + and $3 + ret z ; if mon has cured pokerus, stop searching + inc b ; go on to next mon + jr .checkPreviousMonsLoop + +.infectMon + ld a, c + and $f0 + ld b, a + ld a, c + swap a + and $3 + inc a + add b + ld [hl], a + ret + +; any berry held by a Shuckle may be converted to berry juice +ConvertBerriesToBerryJuice: ; 2ede6 + ld hl, StatusFlags2 + bit 6, [hl] + ret z + call Random + cp $10 + ret nc ; 1/16 chance + ld hl, PartyMons + ld a, [PartyCount] +.partyMonLoop + push af + push hl + ld a, [hl] + cp SHUCKLE + jr nz, .loopMon + ld bc, MON_ITEM + add hl, bc + ld a, [hl] + cp BERRY + jr z, .convertToJuice + +.loopMon + pop hl + ld bc, PARTYMON_STRUCT_LENGTH + add hl, bc + pop af + dec a + jr nz, .partyMonLoop + ret + +.convertToJuice + ld a, BERRY_JUICE + ld [hl], a + pop hl + pop af + ret diff --git a/engine/pokerus_tick.asm b/engine/pokerus_tick.asm new file mode 100644 index 000000000..3c97fdc5e --- /dev/null +++ b/engine/pokerus_tick.asm @@ -0,0 +1,26 @@ +ApplyPokerusTick: ; 13988 +; decreases all pokemon's pokerus counter by b. if the lower nybble reaches zero, the pokerus is cured. + ld hl, PartyMon1PokerusStatus ; PartyMon1 + MON_PKRS + ld a, [PartyCount] + and a + ret z ; make sure it's not wasting time on an empty party + ld c, a +.loop + ld a, [hl] + and $f ; lower nybble is the number of days remaining + jr z, .next ; if already 0, skip + sub b ; subtract the number of days + jr nc, .ok ; max(result, 0) + xor a +.ok + ld d, a ; back up this value because we need to preserve the strain (upper nybble) + ld a, [hl] + and $f0 + add d + ld [hl], a ; this prevents a cured pokemon from recontracting pokerus +.next + ld de, PARTYMON_STRUCT_LENGTH + add hl, de + dec c + jr nz, .loop + ret diff --git a/misc/printer_77.asm b/engine/print_party.asm similarity index 96% rename from misc/printer_77.asm rename to engine/print_party.asm index 4f67909b0..9bf98767b 100755 --- a/misc/printer_77.asm +++ b/engine/print_party.asm @@ -140,14 +140,14 @@ PrintPartyMonPage1: ; 1dc381 ld [hBGMapMode], a call LoadFontsBattleExtra - ld de, MobileHPIcon + ld de, GBPrinterHPIcon ld hl, VTiles2 tile $71 - lb bc, BANK(MobileHPIcon), 1 + lb bc, BANK(GBPrinterHPIcon), 1 call Request1bpp - ld de, MobileLvIcon + ld de, GBPrinterLvIcon ld hl, VTiles2 tile $6e - lb bc, BANK(MobileLvIcon), 1 + lb bc, BANK(GBPrinterLvIcon), 1 call Request1bpp ld de, ShinyIconGFX @@ -354,3 +354,9 @@ String1dc55d: ; 1dc55d String1dc584: ; 1dc584 db "------------@" ; 1dc591 + +GBPrinterHPIcon: ; 1dc591 +INCBIN "gfx/printer/hp.1bpp" + +GBPrinterLvIcon: ; 1dc599 +INCBIN "gfx/printer/lv.1bpp" diff --git a/engine/printer.asm b/engine/printer.asm index 7dd2d4f4a..777ea9269 100755 --- a/engine/printer.asm +++ b/engine/printer.asm @@ -1,4 +1,4 @@ -INCLUDE "engine/printer/serial.asm" +INCLUDE "engine/printer_serial.asm" SendScreenToPrinter: ; 843f0 .loop diff --git a/engine/printer/serial.asm b/engine/printer_serial.asm similarity index 100% rename from engine/printer/serial.asm rename to engine/printer_serial.asm diff --git a/engine/printhoursmins.asm b/engine/printhoursmins.asm new file mode 100644 index 000000000..711ff89b6 --- /dev/null +++ b/engine/printhoursmins.asm @@ -0,0 +1,64 @@ +Function1dd6a9: ; 1dd6a9 +; XXX + ld a, b + ld b, c + ld c, a + push bc + push de + ld hl, sp+$2 + ld d, h + ld e, l + pop hl + lb bc, PRINTNUM_LEADINGZEROS | 2, 5 + call PrintNum + pop bc + ret + +PrintHoursMins ; 1dd6bb (77:56bb) +; Hours in b, minutes in c + ld a, b + cp 12 + push af + jr c, .AM + jr z, .PM + sub 12 + jr .PM +.AM: + or a + jr nz, .PM + ld a, 12 +.PM: + ld b, a +; Crazy stuff happening with the stack + push bc + ld hl, sp+$1 + push de + push hl + pop de + pop hl + ld [hl], " " + lb bc, 1, 2 + call PrintNum + ld [hl], ":" + inc hl + ld d, h + ld e, l + ld hl, sp+$0 + push de + push hl + pop de + pop hl + lb bc, PRINTNUM_LEADINGZEROS | 1, 2 + call PrintNum + pop bc + ld de, String_AM + pop af + jr c, .place_am_pm + ld de, String_PM +.place_am_pm + inc hl + call PlaceString + ret + +String_AM: db "AM@" ; 1dd6fc +String_PM: db "PM@" ; 1dd6ff diff --git a/engine/prof_oaks_pc.asm b/engine/prof_oaks_pc.asm index 05ff2b691..69949940b 100755 --- a/engine/prof_oaks_pc.asm +++ b/engine/prof_oaks_pc.asm @@ -1,4 +1,3 @@ - ProfOaksPC: ; 0x265d3 ld hl, OakPCText1 call MenuTextBox @@ -100,31 +99,26 @@ endr ret OakRatings: ; 0x2667f -oakrating: MACRO - db \1 - dw \2, \3 -endm - ; if you caught at most this many, play this sound, load this text - oakrating 9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01 - oakrating 19, SFX_DEX_FANFARE_LESS_THAN_20, OakRating02 - oakrating 34, SFX_DEX_FANFARE_20_49, OakRating03 - oakrating 49, SFX_DEX_FANFARE_20_49, OakRating04 - oakrating 64, SFX_DEX_FANFARE_50_79, OakRating05 - oakrating 79, SFX_DEX_FANFARE_50_79, OakRating06 - oakrating 94, SFX_DEX_FANFARE_80_109, OakRating07 - oakrating 109, SFX_DEX_FANFARE_80_109, OakRating08 - oakrating 124, SFX_CAUGHT_MON, OakRating09 - oakrating 139, SFX_CAUGHT_MON, OakRating10 - oakrating 154, SFX_DEX_FANFARE_140_169, OakRating11 - oakrating 169, SFX_DEX_FANFARE_140_169, OakRating12 - oakrating 184, SFX_DEX_FANFARE_170_199, OakRating13 - oakrating 199, SFX_DEX_FANFARE_170_199, OakRating14 - oakrating 214, SFX_DEX_FANFARE_200_229, OakRating15 - oakrating 229, SFX_DEX_FANFARE_200_229, OakRating16 - oakrating 239, SFX_DEX_FANFARE_230_PLUS, OakRating17 - oakrating 248, SFX_DEX_FANFARE_230_PLUS, OakRating18 - oakrating 255, SFX_DEX_FANFARE_230_PLUS, OakRating19 + 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 OakPCText1: ; 0x266de text_jump _OakPCText1 diff --git a/engine/radio.asm b/engine/radio.asm index feded7616..58e953e55 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -1578,7 +1578,6 @@ BuenasPassword4: .greater_than_11 call Random maskbits NUM_PASSWORD_CATEGORIES - and x cp NUM_PASSWORD_CATEGORIES jr nc, .greater_than_11 ; Store it in the high nybble of e. diff --git a/trainers/read_attributes.asm b/engine/read_trainer_attributes.asm similarity index 100% rename from trainers/read_attributes.asm rename to engine/read_trainer_attributes.asm diff --git a/trainers/read_party.asm b/engine/read_trainer_party.asm similarity index 100% rename from trainers/read_party.asm rename to engine/read_trainer_party.asm diff --git a/engine/save.asm b/engine/save.asm index 74b0626c8..65339e0bb 100644 --- a/engine/save.asm +++ b/engine/save.asm @@ -500,12 +500,12 @@ HallOfFame_InitSaveIfNeeded: ; 14da0 ; 14da9 ValidateSave: ; 14da9 - ld a, BANK(s1_a008) + ld a, BANK(sCheckValue1) ; BANK(sCheckValue2) call GetSRAMBank - ld a, 99 - ld [s1_a008], a - ld a, " " - ld [s1_ad0f], a + ld a, SAVE_CHECK_VALUE_1 + ld [sCheckValue1], a + ld a, SAVE_CHECK_VALUE_2 + ld [sCheckValue2], a jp CloseSRAM ; 14dbb @@ -568,12 +568,12 @@ SaveChecksum: ; 14e13 ; 14e2d ValidateBackupSave: ; 14e2d - ld a, BANK(s0_b208) + ld a, BANK(sBackupCheckValue1) ; BANK(sBackupCheckValue2) call GetSRAMBank - ld a, 99 - ld [s0_b208], a - ld a, " " - ld [s0_bf0f], a + ld a, SAVE_CHECK_VALUE_1 + ld [sBackupCheckValue1], a + ld a, SAVE_CHECK_VALUE_2 + ld [sBackupCheckValue2], a call CloseSRAM ret ; 14e40 @@ -731,13 +731,13 @@ INCLUDE "data/default_options.asm" CheckPrimarySaveFile: ; 14f84 - ld a, BANK(s1_a008) + ld a, BANK(sCheckValue1) ; BANK(sCheckValue2) call GetSRAMBank - ld a, [s1_a008] - cp 99 + ld a, [sCheckValue1] + cp SAVE_CHECK_VALUE_1 jr nz, .nope - ld a, [s1_ad0f] - cp " " + ld a, [sCheckValue2] + cp SAVE_CHECK_VALUE_2 jr nz, .nope ld hl, sOptions ld de, Options @@ -753,13 +753,13 @@ CheckPrimarySaveFile: ; 14f84 ; 14faf CheckBackupSaveFile: ; 14faf - ld a, BANK(s0_b208) + ld a, BANK(sBackupCheckValue1) ; BANK(sBackupCheckValue2) call GetSRAMBank - ld a, [s0_b208] - cp 99 + ld a, [sBackupCheckValue1] + cp SAVE_CHECK_VALUE_1 jr nz, .nope - ld a, [s0_bf0f] - cp " " + ld a, [sBackupCheckValue2] + cp SAVE_CHECK_VALUE_2 jr nz, .nope ld hl, sBackupOptions ld de, Options diff --git a/engine/selectmenu.asm b/engine/select_menu.asm similarity index 100% rename from engine/selectmenu.asm rename to engine/select_menu.asm diff --git a/predef/sgb.asm b/engine/sgb_layouts.asm similarity index 99% rename from predef/sgb.asm rename to engine/sgb_layouts.asm index dc174e86f..e59fb19d8 100644 --- a/predef/sgb.asm +++ b/engine/sgb_layouts.asm @@ -77,7 +77,7 @@ Predef_LoadSGBLayout: ; 864c ld h, 0 add hl, hl add hl, hl - ld de, Palettes_a8be + ld de, HPBarPals add hl, de ld a, [hli] @@ -95,7 +95,7 @@ Predef_LoadSGBLayout: ; 864c add hl, hl add hl, hl - ld de, Palettes_a8be + ld de, HPBarPals add hl, de ld a, [hli] ld [wSGBPals + 9], a @@ -173,7 +173,7 @@ Predef_LoadSGBLayout: ; 864c ld h, 0 add hl, hl add hl, hl - ld de, Palettes_a8be + ld de, HPBarPals add hl, de ld a, [hli] ld [wSGBPals + 3], a diff --git a/engine/spawn_points.asm b/engine/spawn_points.asm index 5f9c07558..b8637da17 100644 --- a/engine/spawn_points.asm +++ b/engine/spawn_points.asm @@ -1,5 +1,5 @@ -INCLUDE "data/spawn_points.asm" +INCLUDE "data/maps/spawn_points.asm" LoadSpawnPoint: ; 1531f diff --git a/engine/square_root.asm b/engine/square_root.asm new file mode 100644 index 000000000..496f66c83 --- /dev/null +++ b/engine/square_root.asm @@ -0,0 +1,30 @@ +GetSquareRoot: ; 13b87 +; Return the square root of de in b. + +; Rather than calculating the result, we take the index of the +; first value in a table of squares that isn't lower than de. + + ld hl, Squares + ld b, 0 +.loop +; Make sure we don't go past the end of the table. + inc b + ld a, b + cp $ff + ret z + +; Iterate over the table until b**2 >= de. + ld a, [hli] + sub e + ld a, [hli] + sbc d + + jr c, .loop + ret + +Squares: ; 13b98 +root set 1 + rept $ff + dw root*root +root set root+1 + endr diff --git a/engine/start_battle.asm b/engine/start_battle.asm new file mode 100644 index 000000000..51f46b3f2 --- /dev/null +++ b/engine/start_battle.asm @@ -0,0 +1,197 @@ +ShowLinkBattleParticipants: ; 2ee18 +; If we're not in a communications room, +; we don't need to be here. + ld a, [wLinkMode] + and a + ret z + + callba _ShowLinkBattleParticipants + ld c, 150 + call DelayFrames + call ClearTileMap + call ClearSprites + ret + +FindFirstAliveMonAndStartBattle: ; 2ee2f + xor a + ld [hMapAnims], a + call DelayFrame + ld b, 6 + ld hl, PartyMon1HP + ld de, PARTYMON_STRUCT_LENGTH - 1 + +.loop + ld a, [hli] + or [hl] + jr nz, .okay + add hl, de + dec b + jr nz, .loop + +.okay + ld de, MON_LEVEL - MON_HP + add hl, de + ld a, [hl] + ld [BattleMonLevel], a + predef Predef_StartBattle + callba _LoadBattleFontsHPBar + ld a, 1 + ld [hBGMapMode], a + call ClearSprites + call ClearTileMap + xor a + ld [hBGMapMode], a + ld [hWY], a + ld [rWY], a + ld [hMapAnims], a + ret + +PlayBattleMusic: ; 2ee6c + push hl + push de + push bc + + xor a + ld [MusicFade], a + ld de, MUSIC_NONE + call PlayMusic + call DelayFrame + call MaxVolume + + ld a, [BattleType] + cp BATTLETYPE_SUICUNE + ld de, MUSIC_SUICUNE_BATTLE + jp z, .done + cp BATTLETYPE_ROAMING + jp z, .done + + ; Are we fighting a trainer? + ld a, [OtherTrainerClass] + and a + jr nz, .trainermusic + + callba RegionCheck + ld a, e + and a + jr nz, .kantowild + + ld de, MUSIC_JOHTO_WILD_BATTLE + ld a, [TimeOfDay] + cp NITE_F + jr nz, .done + ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT + jr .done + +.kantowild + ld de, MUSIC_KANTO_WILD_BATTLE + jr .done + +.trainermusic + ld de, MUSIC_CHAMPION_BATTLE + cp CHAMPION + jr z, .done + cp RED + jr z, .done + + ; really, they should have included admins and scientists here too... + ld de, MUSIC_ROCKET_BATTLE + cp GRUNTM + jr z, .done + cp GRUNTF + jr z, .done + + ld de, MUSIC_KANTO_GYM_LEADER_BATTLE + callba IsKantoGymLeader + jr c, .done + + ld de, MUSIC_JOHTO_GYM_LEADER_BATTLE + callba IsJohtoGymLeader + jr c, .done + + ld de, MUSIC_RIVAL_BATTLE + ld a, [OtherTrainerClass] + cp RIVAL1 + jr z, .done + cp RIVAL2 + jr nz, .othertrainer + + ld a, [OtherTrainerID] + cp RIVAL2_2_CHIKORITA ; Rival in Indigo Plateau + jr c, .done + ld de, MUSIC_CHAMPION_BATTLE + jr .done + +.othertrainer + ld a, [wLinkMode] + and a + jr nz, .johtotrainer + + callba RegionCheck + ld a, e + and a + jr nz, .kantotrainer + +.johtotrainer + ld de, MUSIC_JOHTO_TRAINER_BATTLE + jr .done + +.kantotrainer + ld de, MUSIC_KANTO_TRAINER_BATTLE + +.done + call PlayMusic + + pop bc + pop de + pop hl + ret + +ClearBattleRAM: ; 2ef18 + xor a + ld [wPlayerAction], a + ld [wBattleResult], a + + ld hl, wPartyMenuCursor + ld [hli], a + ld [hli], a + ld [hli], a + ld [hl], a + + ld [wMenuScrollPosition], a + ld [CriticalHit], a + ld [BattleMonSpecies], a + ld [wBattleParticipantsNotFainted], a + ld [CurBattleMon], a + ld [wForcedSwitch], a + ld [TimeOfDayPal], a + ld [PlayerTurnsTaken], a + ld [EnemyTurnsTaken], a + ld [EvolvableFlags], a + + ld hl, PlayerHPPal + ld [hli], a + ld [hl], a + + ld hl, BattleMonDVs + ld [hli], a + ld [hl], a + + ld hl, EnemyMonDVs + ld [hli], a + ld [hl], a + +; Clear the entire BattleMons area + ld hl, wBattle + ld bc, wBattleEnd - wBattle + xor a + call ByteFill + + callab ResetEnemyStatLevels + + call ClearWindowData + + ld hl, hBGMapAddress + xor a + ld [hli], a + ld [hl], VBGMap0 / $100 + ret diff --git a/engine/startmenu.asm b/engine/start_menu.asm similarity index 100% rename from engine/startmenu.asm rename to engine/start_menu.asm diff --git a/engine/switch_party_mons.asm b/engine/switch_party_mons.asm new file mode 100644 index 000000000..cde9c82b2 --- /dev/null +++ b/engine/switch_party_mons.asm @@ -0,0 +1,145 @@ +_SwitchPartyMons: + ld a, [wd0e3] + dec a + ld [Buffer3], a + ld b, a + ld a, [wMenuCursorY] + dec a + ld [Buffer2], a + cp b + jr z, .skip + call .SwapMonAndMail + ld a, [Buffer3] + call .ClearSprite + ld a, [Buffer2] + call .ClearSprite +.skip + ret + +.ClearSprite: ; 50f34 (14:4f34) + push af + hlcoord 0, 1 + ld bc, 2 * SCREEN_WIDTH + call AddNTimes + ld bc, 2 * SCREEN_WIDTH + ld a, " " + call ByteFill + pop af + ld hl, Sprites + ld bc, $10 + call AddNTimes + ld de, $4 + ld c, $4 +.gfx_loop + ld [hl], $a0 + add hl, de + dec c + jr nz, .gfx_loop + ld de, SFX_SWITCH_POKEMON + call WaitPlaySFX + ret + +.SwapMonAndMail: ; 50f62 (14:4f62) + push hl + push de + push bc + ld bc, PartySpecies + ld a, [Buffer2] + ld l, a + ld h, $0 + add hl, bc + ld d, h + ld e, l + ld a, [Buffer3] + ld l, a + ld h, $0 + add hl, bc + ld a, [hl] + push af + ld a, [de] + ld [hl], a + pop af + ld [de], a + ld a, [Buffer2] + ld hl, PartyMon1Species + ld bc, PARTYMON_STRUCT_LENGTH + call AddNTimes + push hl + ld de, wd002 + ld bc, PARTYMON_STRUCT_LENGTH + call CopyBytes + ld a, [Buffer3] + ld hl, PartyMon1 + ld bc, PARTYMON_STRUCT_LENGTH + call AddNTimes + pop de + push hl + ld bc, PARTYMON_STRUCT_LENGTH + call CopyBytes + pop de + ld hl, wd002 + ld bc, PARTYMON_STRUCT_LENGTH + call CopyBytes + ld a, [Buffer2] + ld hl, PartyMonOT + call SkipNames + push hl + call .CopyNameTowd002 + ld a, [Buffer3] + ld hl, PartyMonOT + call SkipNames + pop de + push hl + call .CopyName + pop de + ld hl, wd002 + call .CopyName + ld hl, PartyMonNicknames + ld a, [Buffer2] + call SkipNames + push hl + call .CopyNameTowd002 + ld hl, PartyMonNicknames + ld a, [Buffer3] + call SkipNames + pop de + push hl + call .CopyName + pop de + ld hl, wd002 + call .CopyName + ld hl, sPartyMail + ld a, [Buffer2] + ld bc, MAIL_STRUCT_LENGTH + call AddNTimes + push hl + ld de, wd002 + ld bc, MAIL_STRUCT_LENGTH + ld a, BANK(sPartyMail) + call GetSRAMBank + call CopyBytes + ld hl, sPartyMail + ld a, [Buffer3] + ld bc, MAIL_STRUCT_LENGTH + call AddNTimes + pop de + push hl + ld bc, MAIL_STRUCT_LENGTH + call CopyBytes + pop de + ld hl, wd002 + ld bc, MAIL_STRUCT_LENGTH + call CopyBytes + call CloseSRAM + pop bc + pop de + pop hl + ret + +.CopyNameTowd002: ; 51036 (14:5036) + ld de, wd002 + +.CopyName: ; 51039 (14:5039) + ld bc, NAME_LENGTH + call CopyBytes + ret diff --git a/engine/tempmon.asm b/engine/tempmon.asm new file mode 100644 index 000000000..332cb0c6c --- /dev/null +++ b/engine/tempmon.asm @@ -0,0 +1,127 @@ +CopyPkmnToTempMon: ; 5084a +; gets the BaseData of a Pkmn +; and copys the PkmnStructure to TempMon + + ld a, [CurPartyMon] + ld e, a + call GetPkmnSpecies + ld a, [CurPartySpecies] + ld [CurSpecies], a + call GetBaseData + + ld a, [MonType] + ld hl, PartyMon1Species + ld bc, PARTYMON_STRUCT_LENGTH + and a + jr z, .copywholestruct + ld hl, OTPartyMon1Species + ld bc, PARTYMON_STRUCT_LENGTH + cp OTPARTYMON + jr z, .copywholestruct + ld bc, BOXMON_STRUCT_LENGTH + callab CopyBoxmonToTempMon + jr .done + +.copywholestruct + ld a, [CurPartyMon] + call AddNTimes + ld de, TempMon + ld bc, PARTYMON_STRUCT_LENGTH + call CopyBytes + +.done + ret + +CalcwBufferMonStats: ; 5088b + ld bc, wBufferMon + jr _TempMonStatsCalculation + +CalcTempmonStats: ; 50890 + ld bc, TempMon +_TempMonStatsCalculation: ; 50893 + ld hl, MON_LEVEL + add hl, bc + ld a, [hl] + ld [CurPartyLevel], a + ld hl, MON_MAXHP + add hl, bc + ld d, h + ld e, l + ld hl, MON_STAT_EXP - 1 + add hl, bc + push bc + ld b, $1 + predef CalcPkmnStats + pop bc + ld hl, MON_HP + add hl, bc + ld d, h + ld e, l + ld a, [CurPartySpecies] + cp EGG + jr nz, .not_egg + xor a + ld [de], a + inc de + ld [de], a + jr .zero_status + +.not_egg + push bc + ld hl, MON_MAXHP + add hl, bc + ld bc, 2 + call CopyBytes + pop bc + +.zero_status + ld hl, MON_STATUS + add hl, bc + xor a + ld [hli], a + ld [hl], a + ret + +GetPkmnSpecies: ; 508d5 +; [MonType] has the type of the Pkmn +; e = Nr. of Pkmn (i.e. [CurPartyMon]) + + ld a, [MonType] + and a ; PARTYMON + jr z, .partymon + cp OTPARTYMON + jr z, .otpartymon + cp BOXMON + jr z, .boxmon + cp TEMPMON + jr z, .breedmon + ; WILDMON + +.partymon + ld hl, PartySpecies + jr .done + +.otpartymon + ld hl, OTPartySpecies + jr .done + +.boxmon + ld a, BANK(sBoxSpecies) + call GetSRAMBank + ld hl, sBoxSpecies + call .done + call CloseSRAM + ret + +.breedmon + ld a, [wBreedMon1Species] + jr .done2 + +.done + ld d, 0 + add hl, de + ld a, [hl] + +.done2 + ld [CurPartySpecies], a + ret diff --git a/engine/time_capsule.asm b/engine/time_capsule.asm new file mode 100755 index 000000000..577b2dce8 --- /dev/null +++ b/engine/time_capsule.asm @@ -0,0 +1,147 @@ +; These functions seem to be related to backwards compatibility + +ValidateOTTrademon: ; fb57e + ld a, [wd003] + ld hl, OTPartyMon1Species + call GetPartyLocation + push hl + ld a, [wd003] + inc a + ld c, a + ld b, 0 + ld hl, OTPartyCount + add hl, bc + ld a, [hl] + pop hl + cp EGG + jr z, .matching_or_egg + cp [hl] + jr nz, .abnormal + +.matching_or_egg + ld b, h + ld c, l + ld hl, MON_LEVEL + add hl, bc + ld a, [hl] + cp MAX_LEVEL + 1 + jr nc, .abnormal + ld a, [wLinkMode] + cp LINK_TIMECAPSULE + jr nz, .normal + ld hl, OTPartySpecies + ld a, [wd003] + ld c, a + ld b, 0 + add hl, bc + ld a, [hl] + + ; Magnemite and Magneton's types changed + ; from Electric to Electric/Steel. + cp MAGNEMITE + jr z, .normal + cp MAGNETON + jr z, .normal + + ld [CurSpecies], a + call GetBaseData + ld hl, wLinkOTPartyMonTypes + add hl, bc + add hl, bc + ld a, [BaseType1] + cp [hl] + jr nz, .abnormal + inc hl + ld a, [BaseType2] + cp [hl] + jr nz, .abnormal + +.normal + and a + ret + +.abnormal + scf + ret +; fb5dd + +Functionfb5dd: ; fb5dd + ld a, [wd002] + ld d, a + ld a, [PartyCount] + ld b, a + ld c, $0 +.loop + ld a, c + cp d + jr z, .next + push bc + ld a, c + ld hl, PartyMon1HP + call GetPartyLocation + pop bc + ld a, [hli] + or [hl] + jr nz, .done + +.next + inc c + dec b + jr nz, .loop + ld a, [wd003] + ld hl, OTPartyMon1HP + call GetPartyLocation + ld a, [hli] + or [hl] + jr nz, .done + scf + ret + +.done + and a + ret +; fb60d + +PlaceTradePartnerNamesAndParty: ; fb60d + hlcoord 4, 0 + ld de, PlayerName + call PlaceString + ld a, $14 + ld [bc], a + hlcoord 4, 8 + ld de, OTPlayerName + call PlaceString + ld a, $14 + ld [bc], a + hlcoord 7, 1 + ld de, PartySpecies + call .PlaceSpeciesNames + hlcoord 7, 9 + ld de, OTPartySpecies +.PlaceSpeciesNames: ; fb634 + ld c, $0 +.loop + ld a, [de] + cp -1 + ret z + ld [wd265], a + push bc + push hl + push de + push hl + ld a, c + ld [hProduct], a + call GetPokemonName + pop hl + call PlaceString + pop de + inc de + pop hl + ld bc, SCREEN_WIDTH + add hl, bc + pop bc + inc c + jr .loop +; fb656 + +INCLUDE "data/time_capsule/special_stats.asm" diff --git a/engine/time_capsule/conversion.asm b/engine/time_capsule/conversion.asm deleted file mode 100755 index eb8896355..000000000 --- a/engine/time_capsule/conversion.asm +++ /dev/null @@ -1,277 +0,0 @@ -; These functions seem to be related to backwards compatibility - -ValidateOTTrademon: ; fb57e - ld a, [wd003] - ld hl, OTPartyMon1Species - call GetPartyLocation - push hl - ld a, [wd003] - inc a - ld c, a - ld b, 0 - ld hl, OTPartyCount - add hl, bc - ld a, [hl] - pop hl - cp EGG - jr z, .matching_or_egg - cp [hl] - jr nz, .abnormal - -.matching_or_egg - ld b, h - ld c, l - ld hl, MON_LEVEL - add hl, bc - ld a, [hl] - cp MAX_LEVEL + 1 - jr nc, .abnormal - ld a, [wLinkMode] - cp LINK_TIMECAPSULE - jr nz, .normal - ld hl, OTPartySpecies - ld a, [wd003] - ld c, a - ld b, 0 - add hl, bc - ld a, [hl] - - ; Magnemite and Magneton's types changed - ; from Electric to Electric/Steel. - cp MAGNEMITE - jr z, .normal - cp MAGNETON - jr z, .normal - - ld [CurSpecies], a - call GetBaseData - ld hl, wLinkOTPartyMonTypes - add hl, bc - add hl, bc - ld a, [BaseType1] - cp [hl] - jr nz, .abnormal - inc hl - ld a, [BaseType2] - cp [hl] - jr nz, .abnormal - -.normal - and a - ret - -.abnormal - scf - ret -; fb5dd - -Functionfb5dd: ; fb5dd - ld a, [wd002] - ld d, a - ld a, [PartyCount] - ld b, a - ld c, $0 -.loop - ld a, c - cp d - jr z, .next - push bc - ld a, c - ld hl, PartyMon1HP - call GetPartyLocation - pop bc - ld a, [hli] - or [hl] - jr nz, .done - -.next - inc c - dec b - jr nz, .loop - ld a, [wd003] - ld hl, OTPartyMon1HP - call GetPartyLocation - ld a, [hli] - or [hl] - jr nz, .done - scf - ret - -.done - and a - ret -; fb60d - -PlaceTradePartnerNamesAndParty: ; fb60d - hlcoord 4, 0 - ld de, PlayerName - call PlaceString - ld a, $14 - ld [bc], a - hlcoord 4, 8 - ld de, OTPlayerName - call PlaceString - ld a, $14 - ld [bc], a - hlcoord 7, 1 - ld de, PartySpecies - call .PlaceSpeciesNames - hlcoord 7, 9 - ld de, OTPartySpecies -.PlaceSpeciesNames: ; fb634 - ld c, $0 -.loop - ld a, [de] - cp -1 - ret z - ld [wd265], a - push bc - push hl - push de - push hl - ld a, c - ld [hProduct], a - call GetPokemonName - pop hl - call PlaceString - pop de - inc de - pop hl - ld bc, SCREEN_WIDTH - add hl, bc - pop bc - inc c - jr .loop -; fb656 - - -INCLUDE "data/time_capsule/special_stats.asm" - - -INCLUDE "event/name_rater.asm" - - -PlaySlowCry: ; fb841 - ld a, [ScriptVar] - call LoadCryHeader - jr c, .done - - ld hl, CryPitch - ld a, [hli] - ld h, [hl] - ld l, a - ld bc, -$140 - add hl, bc - ld a, l - ld [CryPitch], a - ld a, h - ld [CryPitch + 1], a - ld hl, CryLength - ld a, [hli] - ld h, [hl] - ld l, a - ld bc, $60 - add hl, bc - ld a, l - ld [CryLength], a - ld a, h - ld [CryLength + 1], a - callba _PlayCryHeader - call WaitSFX - -.done - ret -; fb877 - -NewPokedexEntry: ; fb877 - ld a, [hMapAnims] - push af - xor a - ld [hMapAnims], a - call LowVolume - call ClearBGPalettes - call ClearTileMap - call UpdateSprites - call ClearSprites - ld a, [wPokedexStatus] - push af - ld a, [hSCX] - add $5 - ld [hSCX], a - xor a - ld [wPokedexStatus], a - callba _NewPokedexEntry - call WaitPressAorB_BlinkCursor - ld a, $1 - ld [wPokedexStatus], a - callba DisplayDexEntry - call WaitPressAorB_BlinkCursor - pop af - ld [wPokedexStatus], a - call MaxVolume - call RotateThreePalettesRight - ld a, [hSCX] - add -5 ; 251 ; NUM_POKEMON - ld [hSCX], a - call .ReturnFromDexRegistration - pop af - ld [hMapAnims], a - ret -; fb8c8 - -.ReturnFromDexRegistration: ; fb8c8 - call ClearTileMap - call LoadFontsExtra - call LoadStandardFont - callba Pokedex_PlaceFrontpicTopLeftCorner - call WaitBGMap2 - callba GetEnemyMonDVs - ld a, [hli] - ld [TempMonDVs], a - ld a, [hl] - ld [TempMonDVs + 1], a - ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS - call GetSGBLayout - call SetPalettes - ret -; fb8f1 - -ConvertMon_2to1: ; fb8f1 -; Takes the Gen-2 Pokemon number stored in wd265, finds it in the Pokered_MonIndices table, and returns its index in wd265. - push bc - push hl - ld a, [wd265] - ld b, a - ld c, 0 - ld hl, Pokered_MonIndices -.loop - inc c - ld a, [hli] - cp b - jr nz, .loop - ld a, c - ld [wd265], a - pop hl - pop bc - ret -; fb908 - -ConvertMon_1to2: ; fb908 -; Takes the Gen-1 Pokemon number stored in wd265 and returns the corresponding value from Pokered_MonIndices in wd265. - push bc - push hl - ld a, [wd265] - dec a - ld hl, Pokered_MonIndices - ld b, 0 - ld c, a - add hl, bc - ld a, [hl] - ld [wd265], a - pop hl - pop bc - ret -; fb91c - - -INCLUDE "data/time_capsule/mon_order.asm" diff --git a/engine/time_capsule_2.asm b/engine/time_capsule_2.asm new file mode 100644 index 000000000..5da72e7c8 --- /dev/null +++ b/engine/time_capsule_2.asm @@ -0,0 +1,39 @@ +ConvertMon_2to1: ; fb8f1 +; Takes the Gen-2 Pokemon number stored in wd265, finds it in the Pokered_MonIndices table, and returns its index in wd265. + push bc + push hl + ld a, [wd265] + ld b, a + ld c, 0 + ld hl, Pokered_MonIndices +.loop + inc c + ld a, [hli] + cp b + jr nz, .loop + ld a, c + ld [wd265], a + pop hl + pop bc + ret +; fb908 + +ConvertMon_1to2: ; fb908 +; Takes the Gen-1 Pokemon number stored in wd265 and returns the corresponding value from Pokered_MonIndices in wd265. + push bc + push hl + ld a, [wd265] + dec a + ld hl, Pokered_MonIndices + ld b, 0 + ld c, a + add hl, bc + ld a, [hl] + ld [wd265], a + pop hl + pop bc + ret +; fb91c + + +INCLUDE "data/time_capsule/mon_order.asm" diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index 263a83fc1..a4a07bc4d 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -1,3 +1,7 @@ +Predef35: ; 8c000 +Predef36: + ret + UpdateTimeOfDayPal:: ; 8c001 call UpdateTime ld a, [TimeOfDay] @@ -196,10 +200,6 @@ endr ret ; 8c0e5 -brightlevel: MACRO - db (\1 << 6) | (\2 << 4) | (\3 << 2) | \4 -ENDM - ReplaceTimeOfDayPals: ; 8c0e5 ld hl, .BrightnessLevels ld a, [wMapTimeOfDay] @@ -230,14 +230,14 @@ ReplaceTimeOfDayPals: ; 8c0e5 ; 8c10f (23:410f) .BrightnessLevels: ; 8c10f - brightlevel 3, 2, 1, 0 - brightlevel 1, 1, 1, 1 - brightlevel 2, 2, 2, 2 - brightlevel 0, 0, 0, 0 - brightlevel 3, 3, 3, 3 - brightlevel 3, 2, 1, 0 - brightlevel 3, 2, 1, 0 - brightlevel 3, 2, 1, 0 + dc 3, 2, 1, 0 + dc 1, 1, 1, 1 + dc 2, 2, 2, 2 + dc 0, 0, 0, 0 + dc 3, 3, 3, 3 + dc 3, 2, 1, 0 + dc 3, 2, 1, 0 + dc 3, 2, 1, 0 ; 8c117 GetTimePalette: ; 8c117 diff --git a/engine/timeset.asm b/engine/timeset.asm index 2a578f998..09c5b3a75 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -40,7 +40,7 @@ InitClock: ; 90672 (24:4672) call RotateFourPalettesRight ld hl, Text_WokeUpOak call PrintText - ld hl, wc608 + ld hl, wTimeSetBuffer ld bc, 50 xor a call ByteFill diff --git a/engine/title.asm b/engine/title.asm index 2073fdf58..ba7f34764 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -399,84 +399,4 @@ INCBIN "gfx/title/crystal.2bpp.lz" ; 10fede TitleScreenPalettes: -; BG - RGB 00, 00, 00 - RGB 19, 00, 00 - RGB 15, 08, 31 - RGB 15, 08, 31 - - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 15, 16, 31 - RGB 31, 01, 13 - - RGB 00, 00, 00 - RGB 07, 07, 07 - RGB 31, 31, 31 - RGB 02, 03, 30 - - RGB 00, 00, 00 - RGB 13, 13, 13 - RGB 31, 31, 18 - RGB 02, 03, 30 - - RGB 00, 00, 00 - RGB 19, 19, 19 - RGB 29, 28, 12 - RGB 02, 03, 30 - - RGB 00, 00, 00 - RGB 25, 25, 25 - RGB 28, 25, 06 - RGB 02, 03, 30 - - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 26, 21, 00 - RGB 02, 03, 30 - - RGB 00, 00, 00 - RGB 11, 11, 19 - RGB 31, 31, 31 - RGB 00, 00, 00 - -; OBJ - RGB 00, 00, 00 - RGB 10, 00, 15 - RGB 17, 05, 22 - RGB 19, 09, 31 - - RGB 31, 31, 31 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 +INCLUDE "data/palettes/title.pal" diff --git a/engine/trade/animation.asm b/engine/trade_animation.asm similarity index 100% rename from engine/trade/animation.asm rename to engine/trade_animation.asm diff --git a/engine/trademon_frontpic.asm b/engine/trademon_frontpic.asm new file mode 100644 index 000000000..1641443ea --- /dev/null +++ b/engine/trademon_frontpic.asm @@ -0,0 +1,38 @@ +GetTrademonFrontpic: ; 4d7fd + ld a, [wOTTrademonSpecies] + ld hl, wOTTrademonDVs + ld de, VTiles2 + push de + push af + predef GetUnownLetter + pop af + ld [CurPartySpecies], a + ld [CurSpecies], a + call GetBaseData + pop de + predef FrontpicPredef + ret + +AnimateTrademonFrontpic: ; 4d81e + ld a, [wOTTrademonSpecies] + call IsAPokemon + ret c + callba ShowOTTrademonStats + ld a, [wOTTrademonSpecies] + ld [CurPartySpecies], a + ld a, [wOTTrademonDVs] + ld [TempMonDVs], a + ld a, [wOTTrademonDVs + 1] + ld [TempMonDVs + 1], a + ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS + call GetSGBLayout + ld a, %11100100 ; 3,2,1,0 + call DmgToCgbBGPals + callba TradeAnim_ShowGetmonFrontpic + ld a, [wOTTrademonSpecies] + ld [CurPartySpecies], a + hlcoord 7, 2 + ld d, $0 + ld e, ANIM_MON_TRADE + predef AnimateFrontpic + ret diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm index fdf17acc9..6ed9f6ea6 100755 --- a/engine/trainer_card.asm +++ b/engine/trainer_card.asm @@ -448,7 +448,7 @@ TrainerCard_Page1_PrintGameTime: ; 25415 (9:5415) ret nz hlcoord 15, 12 ld a, [hl] - xor $7f ^ $2e ; $7F (space) <--> $2E (colon) + xor " " ^ $2e ; alternate between space and small colon ($2e) tiles ld [hl], a ret diff --git a/engine/trainer_scripts.asm b/engine/trainer_scripts.asm new file mode 100644 index 000000000..33dab3b9e --- /dev/null +++ b/engine/trainer_scripts.asm @@ -0,0 +1,31 @@ +TalkToTrainerScript:: ; 0xbe66a + faceplayer + trainerflagaction CHECK_FLAG + iftrue AlreadyBeatenTrainerScript + loadmemtrainer + encountermusic + jump StartBattleWithMapTrainerScript + +SeenByTrainerScript:: ; 0xbe675 + loadmemtrainer + encountermusic + showemote EMOTE_SHOCK, LAST_TALKED, 30 + callasm TrainerWalkToPlayer + applymovement2 MovementBuffer + writepersonxy LAST_TALKED + faceperson PLAYER, LAST_TALKED + jump StartBattleWithMapTrainerScript + +StartBattleWithMapTrainerScript: ; 0xbe68a + opentext + trainertext $0 + waitbutton + closetext + loadmemtrainer + startbattle + reloadmapafterbattle + trainerflagaction SET_FLAG + loadvar wRunningTrainerBattleScript, -1 + +AlreadyBeatenTrainerScript: + scripttalkafter diff --git a/engine/unown_dex.asm b/engine/unown_dex.asm new file mode 100755 index 000000000..6d14f8b3c --- /dev/null +++ b/engine/unown_dex.asm @@ -0,0 +1,51 @@ +UpdateUnownDex: ; fba18 + ld a, [UnownLetter] + ld c, a + ld b, NUM_UNOWN + ld hl, UnownDex +.loop + ld a, [hli] + and a + jr z, .done + cp c + ret z + dec b + jr nz, .loop + ret + +.done + dec hl + ld [hl], c + ret +; fba2e + +PrintUnownWord: ; fba2e (3e:7a2e) + hlcoord 4, 15 + ld bc, 12 + ld a, " " + call ByteFill + ld a, [wDexCurrentUnownIndex] + ld e, a + ld d, 0 + ld hl, UnownDex + add hl, de + ld a, [hl] + ld e, a + ld d, 0 + ld hl, UnownWords + add hl, de + add hl, de + ld a, [hli] + ld e, a + ld d, [hl] + hlcoord 4, 15 +.loop + ld a, [de] + cp -1 + ret z + inc de + ld [hli], a + jr .loop +; fba5a (3e:7a5a) + +INCLUDE "data/unown_words.asm" diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm index a1fed2520..3afe8a17d 100755 --- a/engine/unown_puzzle.asm +++ b/engine/unown_puzzle.asm @@ -1,7 +1,8 @@ -puzcoord EQUS "* 6 +" PUZZLE_BORDER EQU $ee PUZZLE_VOID EQU $ef +puzcoord EQUS "* 6 +" + UnownPuzzle: ; e1190 ld a, [hInMenu] push af @@ -13,7 +14,7 @@ UnownPuzzle: ; e1190 xor a ld [hBGMapMode], a call DisableLCD - ld hl, wMisc + ld hl, wMisc ; includes wPuzzlePieces ld bc, wMiscEnd - wMisc xor a call ByteFill diff --git a/unknown/013a47.asm b/engine/unused_correct_party.asm old mode 100755 new mode 100644 similarity index 99% rename from unknown/013a47.asm rename to engine/unused_correct_party.asm index dd0d2b722..dd2e1111c --- a/unknown/013a47.asm +++ b/engine/unused_correct_party.asm @@ -210,7 +210,7 @@ CorrectErrorsInPlayerParty: ; unreferenced .GetLengthOfStringWith6CharCap: ; 13b71 push de ld c, 1 - ld b, 6 + ld b, NAME_LENGTH_JAPANESE .search_loop ld a, [de] cp "@" diff --git a/misc/unused_title.asm b/engine/unused_title.asm similarity index 71% rename from misc/unused_title.asm rename to engine/unused_title.asm index 6cd79237b..2075d86d9 100644 --- a/misc/unused_title.asm +++ b/engine/unused_title.asm @@ -3,21 +3,24 @@ UnusedTitleScreen: ; 10c000 call ClearBGPalettes call ClearTileMap call DisableLCD + +; Turn BG Map update off xor a ld [hBGMapMode], a +; Reset timing variables ld hl, wJumptableIndex - ld [hli], a - ld [hli], a - ld [hli], a - ld [hl], a + ld [hli], a ; wJumptableIndex + ld [hli], a ; wIntroSceneFrameCounter + ld [hli], a ; wTitleScreenTimer + ld [hl], a ; wTitleScreenTimer + 1 ld hl, UnusedTitleBG_GFX ld de, VTiles2 ld bc, VBGMap0 - VTiles2 call CopyBytes - ld hl, UnusedTitleBG_GFX + $800 + ld hl, UnusedTitleBG_GFX + $80 tiles ld de, VTiles1 ld bc, VTiles2 - VTiles1 call CopyBytes @@ -65,22 +68,22 @@ UnusedTitleScreen: ; 10c000 ld hl, UnusedTitleBG_Palettes ld de, UnknBGPals - ld bc, $40 + ld bc, 8 palettes call CopyBytes ld hl, UnusedTitleFG_Palettes ld de, UnknOBPals - ld bc, $40 + ld bc, 8 palettes call CopyBytes ld hl, UnusedTitleBG_Palettes ld de, BGPals - ld bc, $40 + ld bc, 8 palettes call CopyBytes ld hl, UnusedTitleFG_Palettes ld de, OBPals - ld bc, $40 + ld bc, 8 palettes call CopyBytes pop af @@ -136,46 +139,7 @@ UnusedTitleBG_Tilemap: ; 10d0b1 ; 10d8b1 UnusedTitleBG_Palettes: ; 10d8b1 - RGB 00, 00, 00 - RGB 25, 15, 28 - RGB 22, 11, 28 - RGB 19, 08, 26 - - RGB 00, 00, 00 - RGB 17, 07, 22 - RGB 13, 07, 16 - RGB 19, 08, 26 - - RGB 25, 15, 28 - RGB 22, 11, 28 - RGB 19, 08, 26 - RGB 17, 07, 22 - - RGB 22, 11, 28 - RGB 19, 08, 26 - RGB 17, 07, 22 - RGB 13, 07, 16 - - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 16, 16, 24 - RGB 02, 13, 21 - - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 12, 12, 12 - - RGB 00, 00, 00 - RGB 01, 11, 23 - RGB 16, 16, 24 - RGB 02, 13, 21 - - RGB 00, 00, 00 - RGB 22, 10, 31 - RGB 19, 08, 26 - RGB 17, 07, 22 - +INCLUDE "data/palettes/unused_title/bg.pal" RGB 31, 31, 31 RGB 31, 31, 31 @@ -187,12 +151,12 @@ UnusedTitleBG_Palettes: ; 10d8b1 RGB 16, 08, 16 RGB 24, 00, 24 - rept 54 +rept 54 RGB 31, 31, 31 RGB 31, 31, 31 RGB 31, 31, 31 RGB 31, 31, 31 - endr +endr ; 10dab1 UnusedTitleFG_GFX: ; 10dab1 @@ -200,326 +164,7 @@ INCBIN "gfx/title/old_fg.2bpp" ; 10eab1 UnusedTitleFG_Palettes: ; 10eab1 - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 16, 16, 24 - RGB 02, 13, 21 - - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 12, 12, 12 - - RGB 00, 00, 00 - RGB 01, 11, 23 - RGB 16, 16, 24 - RGB 02, 13, 21 - - RGB 00, 00, 00 - RGB 31, 22, 00 - RGB 31, 27, 00 - RGB 31, 31, 00 - - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 16, 16, 24 - RGB 02, 13, 21 - - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 12, 12, 12 - - RGB 00, 00, 00 - RGB 01, 11, 23 - RGB 16, 16, 24 - RGB 02, 13, 21 - - RGB 16, 31, 00 - RGB 22, 31, 00 - RGB 27, 31, 00 - RGB 31, 31, 00 - - - RGB 31, 00, 18 - RGB 31, 31, 31 - RGB 16, 16, 24 - RGB 02, 13, 21 - - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 12, 12, 12 - - RGB 00, 00, 00 - RGB 01, 11, 23 - RGB 16, 16, 24 - RGB 02, 13, 21 - - RGB 16, 31, 00 - RGB 22, 31, 00 - RGB 27, 31, 00 - RGB 31, 31, 00 - - RGB 24, 18, 31 - RGB 31, 31, 00 - RGB 31, 31, 01 - RGB 31, 31, 03 - - RGB 31, 31, 05 - RGB 31, 31, 08 - RGB 31, 31, 10 - RGB 31, 31, 12 - - RGB 31, 31, 14 - RGB 31, 31, 16 - RGB 31, 31, 18 - RGB 31, 31, 20 - - RGB 31, 31, 22 - RGB 31, 31, 25 - RGB 31, 31, 27 - RGB 31, 31, 29 - - RGB 24, 06, 06 - RGB 01, 01, 01 - RGB 03, 03, 03 - RGB 05, 05, 05 - - RGB 08, 08, 08 - RGB 10, 10, 10 - RGB 12, 12, 12 - RGB 14, 14, 14 - - RGB 16, 16, 16 - RGB 18, 18, 18 - RGB 20, 20, 20 - RGB 22, 22, 22 - - RGB 25, 25, 25 - RGB 27, 27, 27 - RGB 29, 29, 29 - RGB 31, 31, 31 - - RGB 18, 24, 18 - RGB 31, 29, 01 - RGB 31, 27, 03 - RGB 31, 25, 05 - - RGB 31, 22, 08 - RGB 31, 20, 10 - RGB 31, 18, 12 - RGB 31, 16, 14 - - RGB 31, 14, 16 - RGB 31, 12, 18 - RGB 31, 10, 20 - RGB 31, 08, 22 - - RGB 31, 05, 25 - RGB 31, 03, 27 - RGB 31, 01, 29 - RGB 31, 00, 31 - - RGB 18, 06, 31 - RGB 00, 31, 31 - RGB 00, 31, 29 - RGB 00, 31, 27 - - RGB 00, 31, 25 - RGB 00, 31, 22 - RGB 00, 31, 20 - RGB 00, 31, 18 - - RGB 00, 31, 16 - RGB 00, 31, 14 - RGB 00, 31, 12 - RGB 00, 31, 10 - - RGB 00, 31, 08 - RGB 00, 31, 05 - RGB 00, 31, 03 - RGB 00, 31, 01 - - RGB 12, 31, 06 - RGB 00, 00, 31 - RGB 00, 01, 31 - RGB 00, 03, 31 - - RGB 00, 05, 31 - RGB 00, 08, 31 - RGB 00, 10, 31 - RGB 00, 12, 31 - - RGB 00, 14, 31 - RGB 00, 16, 31 - RGB 00, 18, 31 - RGB 00, 20, 31 - - RGB 00, 22, 31 - RGB 00, 25, 31 - RGB 00, 27, 31 - RGB 00, 29, 31 - - RGB 00, 00, 00 - RGB 06, 00, 04 - RGB 19, 02, 09 - RGB 28, 04, 11 - - RGB 31, 07, 16 - RGB 31, 17, 23 - RGB 31, 26, 30 - RGB 07, 05, 10 - - RGB 14, 10, 18 - RGB 20, 20, 25 - RGB 25, 27, 31 - RGB 09, 05, 06 - - RGB 23, 16, 13 - RGB 30, 23, 22 - RGB 31, 28, 28 - RGB 31, 31, 31 - - RGB 06, 31, 31 - RGB 04, 00, 04 - RGB 11, 02, 04 - RGB 17, 02, 04 - - RGB 24, 05, 04 - RGB 28, 07, 04 - RGB 31, 11, 04 - RGB 02, 01, 15 - - RGB 04, 11, 22 - RGB 12, 25, 25 - RGB 20, 31, 31 - RGB 09, 04, 03 - - RGB 22, 11, 08 - RGB 27, 19, 16 - RGB 30, 28, 26 - RGB 31, 31, 31 - - RGB 06, 18, 06 - RGB 04, 04, 02 - RGB 07, 07, 02 - RGB 18, 18, 04 - - RGB 24, 24, 06 - RGB 27, 27, 11 - RGB 31, 31, 20 - RGB 02, 03, 10 - - RGB 04, 05, 13 - RGB 06, 10, 25 - RGB 08, 15, 31 - RGB 04, 00, 06 - - RGB 11, 07, 14 - RGB 21, 16, 23 - RGB 29, 26, 31 - RGB 31, 31, 31 - - RGB 06, 00, 18 - RGB 00, 04, 03 - RGB 02, 09, 05 - RGB 11, 19, 07 - - RGB 16, 24, 08 - RGB 22, 31, 09 - RGB 24, 31, 18 - RGB 03, 01, 03 - - RGB 10, 04, 10 - RGB 20, 08, 20 - RGB 31, 17, 31 - RGB 01, 03, 06 - - RGB 05, 09, 10 - RGB 15, 21, 21 - RGB 23, 25, 25 - RGB 31, 31, 31 - - RGB 00, 18, 31 - RGB 00, 05, 07 - RGB 00, 08, 13 - RGB 00, 12, 17 - - RGB 01, 20, 24 - RGB 04, 27, 31 - RGB 14, 31, 31 - RGB 04, 02, 02 - - RGB 15, 01, 03 - RGB 26, 04, 07 - RGB 31, 13, 16 - RGB 00, 05, 02 - - RGB 01, 11, 03 - RGB 06, 21, 06 - RGB 13, 31, 16 - RGB 31, 31, 31 - - RGB 00, 06, 06 - RGB 00, 01, 08 - RGB 00, 05, 14 - RGB 00, 08, 19 - - RGB 02, 14, 26 - RGB 04, 21, 31 - RGB 06, 26, 31 - RGB 13, 00, 00 - - RGB 27, 07, 00 - RGB 31, 17, 05 - RGB 31, 25, 16 - RGB 02, 04, 00 - - RGB 07, 11, 03 - RGB 17, 19, 05 - RGB 27, 31, 16 - RGB 31, 31, 31 - - RGB 02, 00, 00 - RGB 04, 01, 06 - RGB 11, 03, 14 - RGB 16, 04, 19 - - RGB 20, 07, 22 - RGB 26, 12, 27 - RGB 26, 20, 31 - RGB 04, 07, 00 - - RGB 16, 20, 07 - RGB 24, 28, 15 - RGB 29, 31, 24 - RGB 05, 02, 02 - - RGB 15, 04, 02 - RGB 24, 11, 10 - RGB 31, 22, 20 - RGB 31, 31, 31 - - RGB 00, 00, 14 - RGB 12, 00, 00 - RGB 27, 05, 00 - RGB 31, 15, 05 - - RGB 31, 26, 13 - RGB 31, 30, 21 - RGB 05, 07, 16 - RGB 04, 16, 20 - - RGB 04, 24, 26 - RGB 08, 31, 31 - RGB 23, 31, 31 - RGB 00, 00, 00 - - RGB 05, 05, 05 - RGB 17, 17, 15 - RGB 28, 28, 24 - RGB 31, 31, 31 +INCLUDE "data/palettes/unused_title/ob.pal" ; 10ecb1 UnusedTitleFG_OAM: ; 10ecb1 diff --git a/event/buena.asm b/event/buena.asm index 4802943f9..2cb3b5a63 100644 --- a/event/buena.asm +++ b/event/buena.asm @@ -288,9 +288,15 @@ Buena_PrizeMenu: ; 8b0e2 dba .prizepoints ; 8b129 +NUM_BUENA_PRIZES EQU 9 ; ((BuenaPrizeItemsEnd - BuenaPrizeItems) / 2) + .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 +325,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 +333,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/buena_menu.asm b/event/buena_menu.asm new file mode 100644 index 000000000..b453da783 --- /dev/null +++ b/event/buena_menu.asm @@ -0,0 +1,58 @@ +AskRememberPassword: ; 4ae12 + call .DoMenu + ld a, $0 + jr c, .okay + ld a, $1 + +.okay + ld [ScriptVar], a + ret + +.DoMenu: ; 4ae1f + lb bc, 14, 7 + push bc + ld hl, YesNoMenuDataHeader + call CopyMenuDataHeader + pop bc + ld a, b + ld [wMenuBorderLeftCoord], a + add $5 + ld [wMenuBorderRightCoord], a + ld a, c + ld [wMenuBorderTopCoord], a + add $4 + ld [wMenuBorderBottomCoord], a + call PushWindow + call VerticalMenu + push af + ld c, 15 + call DelayFrames + call Buena_ExitMenu + pop af + jr c, .refused + ld a, [wMenuCursorY] + cp $2 + jr z, .refused + and a + ret + +.refused + ld a, $2 + ld [wMenuCursorY], a + scf + ret + +Buena_ExitMenu: ; 4ae5e + ld a, [hOAMUpdate] + push af + call ExitMenu + call UpdateSprites + xor a + ld [hOAMUpdate], a + call DelayFrame + ld a, $1 + ld [hOAMUpdate], a + call ApplyTilemap + pop af + ld [hOAMUpdate], a + ret diff --git a/event/bug_contest/caught_mon.asm b/event/bug_contest/caught_mon.asm new file mode 100644 index 000000000..729033d8b --- /dev/null +++ b/event/bug_contest/caught_mon.asm @@ -0,0 +1,38 @@ +BugContest_SetCaughtContestMon: ; e6ce + ld a, [wContestMon] + and a + jr z, .firstcatch + ld [wd265], a + callba DisplayAlreadyCaughtText + callba DisplayCaughtContestMonStats + lb bc, 14, 7 + call PlaceYesNoBox + ret c + +.firstcatch + call .generatestats + ld a, [TempEnemyMonSpecies] + ld [wd265], a + call GetPokemonName + ld hl, .caughttext + call PrintText + ret + +.generatestats ; e6fd + ld a, [TempEnemyMonSpecies] + ld [CurSpecies], a + ld [CurPartySpecies], a + call GetBaseData + xor a + ld bc, PARTYMON_STRUCT_LENGTH + ld hl, wContestMon + call ByteFill + xor a + ld [MonType], a + ld hl, wContestMon + jp GeneratePartyMonStats + +.caughttext ; 0xe71d + ; Caught @ ! + text_jump UnknownText_0x1c10c0 + db "@" diff --git a/event/bug_contest/contest.asm b/event/bug_contest/contest.asm new file mode 100644 index 000000000..2cb88ad30 --- /dev/null +++ b/event/bug_contest/contest.asm @@ -0,0 +1,43 @@ +Special_GiveParkBalls: ; 135db + xor a + ld [wContestMon], a + ld a, 20 + ld [wParkBallsRemaining], a + callba StartBugContestTimer + ret + +BugCatchingContestBattleScript:: ; 0x135eb + writecode VAR_BATTLETYPE, BATTLETYPE_CONTEST + randomwildmon + startbattle + reloadmapafterbattle + copybytetovar wParkBallsRemaining + iffalse BugCatchingContestOutOfBallsScript + end + +BugCatchingContestOverScript:: ; 0x135f8 + playsound SFX_ELEVATOR_END + opentext + writetext BugCatchingContestText_BeeepTimesUp + waitbutton + jump BugCatchingContestReturnToGateScript + +BugCatchingContestOutOfBallsScript: ; 0x13603 + playsound SFX_ELEVATOR_END + opentext + writetext BugCatchingContestText_ContestIsOver + waitbutton + +BugCatchingContestReturnToGateScript: ; 0x1360b + closetext + jumpstd bugcontestresultswarp + +BugCatchingContestText_BeeepTimesUp: ; 0x1360f + ; ANNOUNCER: BEEEP! Time's up! + text_jump UnknownText_0x1bd2ca + db "@" + +BugCatchingContestText_ContestIsOver: ; 0x13614 + ; ANNOUNCER: The Contest is over! + text_jump UnknownText_0x1bd2e7 + db "@" diff --git a/event/bug_contest_2.asm b/event/bug_contest/contest_2.asm similarity index 100% rename from event/bug_contest_2.asm rename to event/bug_contest/contest_2.asm diff --git a/event/bug_contest/display_stats.asm b/event/bug_contest/display_stats.asm new file mode 100644 index 000000000..d6ad3997e --- /dev/null +++ b/event/bug_contest/display_stats.asm @@ -0,0 +1,107 @@ +DisplayCaughtContestMonStats: ; cc000 + call ClearBGPalettes + call ClearTileMap + call ClearSprites + call LoadFontsBattleExtra + + ld hl, Options + ld a, [hl] + push af + set 4, [hl] + + hlcoord 0, 0 + ld b, 4 + ld c, 13 + call TextBox + + hlcoord 0, 6 + ld b, 4 + ld c, 13 + call TextBox + + hlcoord 2, 0 + ld de, .Stock + call PlaceString + + hlcoord 2, 6 + ld de, .This + call PlaceString + + hlcoord 5, 4 + ld de, .Health + call PlaceString + + hlcoord 5, 10 + ld de, .Health + call PlaceString + + ld a, [wContestMon] + ld [wd265], a + call GetPokemonName + ld de, StringBuffer1 + hlcoord 1, 2 + call PlaceString + + ld h, b + ld l, c + ld a, [wContestMonLevel] + ld [TempMonLevel], a + call PrintLevel + + ld de, EnemyMonNick + hlcoord 1, 8 + call PlaceString + + ld h, b + ld l, c + ld a, [EnemyMonLevel] + ld [TempMonLevel], a + call PrintLevel + + hlcoord 11, 4 + ld de, wContestMonMaxHP + lb bc, 2, 3 + call PrintNum + + hlcoord 11, 10 + ld de, EnemyMonMaxHP + call PrintNum + + ld hl, SwitchMonText + call PrintText + + pop af + ld [Options], a + + call WaitBGMap + ld b, SCGB_DIPLOMA + call GetSGBLayout + call SetPalettes + ret + +.Health: + db "HEALTH@" +.Stock: + db " STOCK ", $4a, " @" +.This: + db " THIS ", $4a, " @" + +SwitchMonText: ; cc0c2 + ; Switch #MON? + text_jump UnknownText_0x1c10cf + db "@" + +DisplayAlreadyCaughtText: ; cc0c7 + call GetPokemonName + ld hl, .AlreadyCaughtText + jp PrintText + +.AlreadyCaughtText: ; 0xcc0d0 + ; You already caught a @ . + text_jump UnknownText_0x1c10dd + db "@" + +Predef2F: +Predef38: +Predef39: ; cc0d5 + ret diff --git a/event/bug_contest_judging.asm b/event/bug_contest/judging.asm similarity index 100% rename from event/bug_contest_judging.asm rename to event/bug_contest/judging.asm diff --git a/event/catch_tutorial.asm b/event/catch_tutorial.asm new file mode 100644 index 000000000..8340d8c13 --- /dev/null +++ b/event/catch_tutorial.asm @@ -0,0 +1,81 @@ +CatchTutorial:: ; 4e554 + ld a, [BattleType] + dec a + ld c, a + ld hl, .dw + ld b, 0 + add hl, bc + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + jp hl + +.dw ; 4e564 (13:6564) + dw .DudeTutorial + dw .DudeTutorial + dw .DudeTutorial + +.DudeTutorial: ; 4e56a (13:656a) +; Back up your name to your Mom's name. + ld hl, PlayerName + ld de, MomsName + ld bc, NAME_LENGTH + call CopyBytes +; Copy Dude's name to your name + ld hl, .Dude + ld de, PlayerName + ld bc, NAME_LENGTH + call CopyBytes + + call .LoadDudeData + + xor a + ld [hJoyDown], a + ld [hJoyPressed], a + ld a, [Options] + push af + and $f8 + add $3 + ld [Options], a + ld hl, .AutoInput + ld a, BANK(.AutoInput) + call StartAutoInput + callab StartBattle + call StopAutoInput + pop af + + ld [Options], a + ld hl, MomsName + ld de, PlayerName + ld bc, NAME_LENGTH + call CopyBytes + ret + +.LoadDudeData: ; 4e5b7 (13:65b7) + ld hl, wDudeNumItems + ld [hl], 1 + inc hl + ld [hl], POTION + inc hl + ld [hl], 1 + inc hl + ld [hl], -1 + ld hl, wDudeNumKeyItems + ld [hl], 0 + inc hl + ld [hl], -1 + ld hl, wDudeNumBalls + ld a, 1 + ld [hli], a + ld a, POKE_BALL ; 5 + ld [hli], a + ld [hli], a + ld [hl], -1 + ret + +.Dude: ; 4e5da + db "DUDE@" + +.AutoInput: ; 4e5df + db NO_INPUT, $ff ; end diff --git a/event/catch_tutorial_input.asm b/event/catch_tutorial_input.asm new file mode 100644 index 000000000..9d2a03db2 --- /dev/null +++ b/event/catch_tutorial_input.asm @@ -0,0 +1,43 @@ +_DudeAutoInput_A:: ; 1de28a + ld hl, DudeAutoInput_A + jr _DudeAutoInput + +_DudeAutoInput_RightA: ; 1de28f + ld hl, DudeAutoInput_RightA + jr _DudeAutoInput + +_DudeAutoInput_DownA: ; 1de294 + ld hl, DudeAutoInput_DownA + jr _DudeAutoInput + +_DudeAutoInput: ; 1de299 + ld a, BANK(DudeAutoInputs) + call StartAutoInput + ret + +DudeAutoInputs: + +DudeAutoInput_A: ; 1de29f + db NO_INPUT, $50 + db A_BUTTON, $00 + db NO_INPUT, $ff ; end + +DudeAutoInput_RightA: ; 1de2a5 + db NO_INPUT, $08 + db D_RIGHT, $00 + db NO_INPUT, $08 + db A_BUTTON, $00 + db NO_INPUT, $ff ; end + +DudeAutoInput_DownA: ; 1de2af + db NO_INPUT, $fe + db NO_INPUT, $fe + db NO_INPUT, $fe + db NO_INPUT, $fe + db D_DOWN, $00 + db NO_INPUT, $fe + db NO_INPUT, $fe + db NO_INPUT, $fe + db NO_INPUT, $fe + db A_BUTTON, $00 + db NO_INPUT, $ff ; end diff --git a/event/celebi.asm b/event/celebi.asm index c9be9cb39..ab0a333f2 100755 --- a/event/celebi.asm +++ b/event/celebi.asm @@ -124,12 +124,13 @@ CelebiEvent_SpawnLeaf: ; 49944 ; 49962 SpecialCelebiLeafGFX: ; 49962 -INCBIN "gfx/special/celebi/leaf.2bpp" +INCBIN "gfx/overworld/cut_grass.2bpp" + SpecialCelebiGFX: ; 499a2 -INCBIN "gfx/special/celebi/1.2bpp" -INCBIN "gfx/special/celebi/2.2bpp" -INCBIN "gfx/special/celebi/3.2bpp" -INCBIN "gfx/special/celebi/4.2bpp" +INCBIN "gfx/overworld/celebi/1.2bpp" +INCBIN "gfx/overworld/celebi/2.2bpp" +INCBIN "gfx/overworld/celebi/3.2bpp" +INCBIN "gfx/overworld/celebi/4.2bpp" UpdateCelebiPosition: ; 49aa2 (12:5aa2) diff --git a/engine/healmachineanim.asm b/event/heal_machine_anim.asm similarity index 100% rename from engine/healmachineanim.asm rename to event/heal_machine_anim.asm diff --git a/event/lucky_number.asm b/event/lucky_number.asm new file mode 100644 index 000000000..8cec7599d --- /dev/null +++ b/event/lucky_number.asm @@ -0,0 +1,226 @@ +Special_CheckForLuckyNumberWinners: ; 4d87a + xor a + ld [ScriptVar], a + ld [wFoundMatchingIDInParty], a + ld a, [PartyCount] + and a + ret z + ld d, a + ld hl, PartyMon1ID + ld bc, PartySpecies +.PartyLoop: + ld a, [bc] + inc bc + cp EGG + call nz, .CompareLuckyNumberToMonID + push bc + ld bc, PARTYMON_STRUCT_LENGTH + add hl, bc + pop bc + dec d + jr nz, .PartyLoop + ld a, BANK(sBox) + call GetSRAMBank + ld a, [sBoxCount] + and a + jr z, .SkipOpenBox + ld d, a + ld hl, sBoxMon1ID + ld bc, sBoxSpecies +.OpenBoxLoop: + ld a, [bc] + inc bc + cp EGG + jr z, .SkipOpenBoxMon + call .CompareLuckyNumberToMonID + jr nc, .SkipOpenBoxMon + ld a, 1 + ld [wFoundMatchingIDInParty], a + +.SkipOpenBoxMon: + push bc + ld bc, BOXMON_STRUCT_LENGTH + add hl, bc + pop bc + dec d + jr nz, .OpenBoxLoop + +.SkipOpenBox: + call CloseSRAM + ld c, $0 +.BoxesLoop: + ld a, [wCurBox] + and $f + cp c + jr z, .SkipBox + ld hl, .BoxBankAddresses + ld b, 0 + add hl, bc + add hl, bc + add hl, bc + ld a, [hli] + call GetSRAMBank + ld a, [hli] + ld h, [hl] + ld l, a ; hl now contains the address of the loaded box in SRAM + ld a, [hl] + and a + jr z, .SkipBox ; no mons in this box + push bc + ld b, h + ld c, l + inc bc + ld de, sBoxMon1ID - sBox + add hl, de + ld d, a +.BoxNLoop: + ld a, [bc] + inc bc + cp EGG + jr z, .SkipBoxMon + + call .CompareLuckyNumberToMonID ; sets ScriptVar and CurPartySpecies appropriately + jr nc, .SkipBoxMon + ld a, 1 + ld [wFoundMatchingIDInParty], a + +.SkipBoxMon: + push bc + ld bc, BOXMON_STRUCT_LENGTH + add hl, bc + pop bc + dec d + jr nz, .BoxNLoop + pop bc + +.SkipBox: + inc c + ld a, c + cp NUM_BOXES + jr c, .BoxesLoop + + call CloseSRAM + ld a, [ScriptVar] + and a + ret z ; found nothing + callba TrainerRankings_LuckyNumberShow + ld a, [wFoundMatchingIDInParty] + and a + push af + ld a, [CurPartySpecies] + ld [wNamedObjectIndexBuffer], a + call GetPokemonName + ld hl, .FoundPartymonText + pop af + jr z, .print + ld hl, .FoundBoxmonText + +.print + jp PrintText + +.CompareLuckyNumberToMonID: ; 4d939 + push bc + push de + push hl + ld d, h + ld e, l + ld hl, Buffer1 + lb bc, PRINTNUM_LEADINGZEROS | 2, 5 + call PrintNum + ld hl, LuckyNumberDigit1Buffer + ld de, wLuckyIDNumber + lb bc, PRINTNUM_LEADINGZEROS | 2, 5 + call PrintNum + ld b, 5 + ld c, 0 + ld hl, LuckyNumberDigit5Buffer + ld de, Buffer5 +.loop + ld a, [de] + cp [hl] + jr nz, .done + dec de + dec hl + inc c + dec b + jr nz, .loop + +.done + pop hl + push hl + ld de, -6 + add hl, de + ld a, [hl] + pop hl + pop de + push af + ld a, c + ld b, 1 + cp 5 + jr z, .okay + ld b, 2 + cp 3 + jr nc, .okay + ld b, 3 + cp 2 + jr nz, .nomatch + +.okay + inc b + ld a, [ScriptVar] + and a + jr z, .bettermatch + cp b + jr c, .nomatch + +.bettermatch + dec b + ld a, b + ld [ScriptVar], a + pop bc + ld a, b + ld [CurPartySpecies], a + pop bc + scf + ret + +.nomatch + pop bc + pop bc + and a + ret + +.BoxBankAddresses: ; 4d99f + dba sBox1 + dba sBox2 + dba sBox3 + dba sBox4 + dba sBox5 + dba sBox6 + dba sBox7 + dba sBox8 + dba sBox9 + dba sBox10 + dba sBox11 + dba sBox12 + dba sBox13 + dba sBox14 + +.FoundPartymonText: ; 0x4d9c9 + ; Congratulations! We have a match with the ID number of @ in your party. + text_jump UnknownText_0x1c1261 + db "@" + +.FoundBoxmonText: ; 0x4d9ce + ; Congratulations! We have a match with the ID number of @ in your PC BOX. + text_jump UnknownText_0x1c12ae + db "@" + +Special_PrintTodaysLuckyNumber: ; 4d9d3 + ld hl, StringBuffer3 + ld de, wLuckyIDNumber + lb bc, PRINTNUM_LEADINGZEROS | 2, 5 + call PrintNum + ld a, "@" + ld [StringBuffer3 + 5], a + ret diff --git a/event/itemball.asm b/event/misc_scripts.asm similarity index 84% rename from event/itemball.asm rename to event/misc_scripts.asm index ed0c6a9e0..97372a57a 100755 --- a/event/itemball.asm +++ b/event/misc_scripts.asm @@ -1,3 +1,11 @@ +Script_AbortBugContest: ; 0x122c1 + checkflag ENGINE_BUG_CONTEST_TIMER + iffalse .finish + setflag ENGINE_DAILY_BUG_CONTEST + special ContestReturnMons +.finish + end + FindItemInBallScript:: ; 0x122ce callasm .TryReceiveItem iffalse .no_room diff --git a/event/misc_scripts_2.asm b/event/misc_scripts_2.asm new file mode 100644 index 000000000..c4c51d5e6 --- /dev/null +++ b/event/misc_scripts_2.asm @@ -0,0 +1,51 @@ +RepelWoreOffScript:: ; 0x13619 + opentext + writetext .text + waitbutton + closetext + end + +.text ; 0x13620 + ; REPEL's effect wore off. + text_jump UnknownText_0x1bd308 + db "@" + +HiddenItemScript:: ; 0x13625 + opentext + copybytetovar EngineBuffer3 + itemtotext 0, 0 + writetext .found_text + giveitem ITEM_FROM_MEM + iffalse .bag_full + callasm SetMemEvent + specialsound + itemnotify + jump .finish + +.bag_full ; 0x1363e + buttonsound + writetext .no_room_text + waitbutton + +.finish ; 13643 + closetext + end + +.found_text ; 0x13645 + ; found @ ! + text_jump UnknownText_0x1bd321 + db "@" + +.no_room_text ; 0x1364a + ; But has no space left… + text_jump UnknownText_0x1bd331 + db "@" + +SetMemEvent: ; 1364f + ld hl, EngineBuffer1 + ld a, [hli] + ld d, [hl] + ld e, a + ld b, SET_FLAG + call EventFlagAction + ret diff --git a/event/mom_phone.asm b/event/mom_phone.asm index 0d7a2366f..aab4abe4b 100755 --- a/event/mom_phone.asm +++ b/event/mom_phone.asm @@ -1,3 +1,6 @@ +NUM_MOM_ITEMS_1 EQUS "((MomItems_1End - MomItems_1) / 8)" +NUM_MOM_ITEMS_2 EQUS "((MomItems_2End - MomItems_2) / 8)" + const_value = 1 const MOM_ITEM const MOM_DOLL @@ -57,7 +60,7 @@ MomTriesToBuySomething:: ; fcfec CheckBalance_MomItem2: ; fd044 ld a, [wWhichMomItem] - cp 10 + cp NUM_MOM_ITEMS_2 jr nc, .nope call GetItemFromMom ld a, [hli] @@ -100,7 +103,7 @@ CheckBalance_MomItem2: ; fd044 .exact call .AddMoney - ld a, 5 + ld a, NUM_MOM_ITEMS_1 call RandomRange inc a ld [wWhichMomItemSet], a @@ -195,7 +198,7 @@ GetItemFromMom: ; fd117 .zero ld a, [wWhichMomItem] - cp 10 ; length of MomItems_2 + cp NUM_MOM_ITEMS_2 jr c, .ok xor a @@ -212,7 +215,7 @@ endr ret ; fd136 -INCLUDE "data/mom_phone_items.asm" +INCLUDE "data/items/mom_phone.asm" db 0, 0, 0 ; XXX diff --git a/event/move_tutor.asm b/event/move_tutor.asm new file mode 100644 index 000000000..b26114dd0 --- /dev/null +++ b/event/move_tutor.asm @@ -0,0 +1,103 @@ +Special_MoveTutor: ; 4925b + call FadeToMenu + call ClearBGPalettes + call ClearScreen + call DelayFrame + ld b, SCGB_PACKPALS + call GetSGBLayout + xor a + ld [wItemAttributeParamBuffer], a + call .GetMoveTutorMove + ld [wd265], a + ld [wPutativeTMHMMove], a + call GetMoveName + call CopyName1 + callba ChooseMonToLearnTMHM + jr c, .cancel + jr .enter_loop + +.loop + callba ChooseMonToLearnTMHM_NoRefresh + jr c, .cancel +.enter_loop + call CheckCanLearnMoveTutorMove + jr nc, .loop + xor a + ld [ScriptVar], a + jr .quit + +.cancel + ld a, -1 + ld [ScriptVar], a +.quit + call CloseSubmenu + ret + +.GetMoveTutorMove: ; 492a5 + ld a, [ScriptVar] + cp 1 + jr z, .flamethrower + cp 2 + jr z, .thunderbolt + ld a, ICE_BEAM + ret + +.flamethrower + ld a, FLAMETHROWER + ret + +.thunderbolt + ld a, THUNDERBOLT + ret + +CheckCanLearnMoveTutorMove: ; 492b9 + ld hl, .MenuDataHeader + call LoadMenuDataHeader + + predef CanLearnTMHMMove + + push bc + ld a, [CurPartyMon] + ld hl, PartyMonNicknames + call GetNick + pop bc + + ld a, c + and a + jr nz, .can_learn + push de + ld de, SFX_WRONG + call PlaySFX + pop de + ld a, BANK(Text_TMHMNotCompatible) + ld hl, Text_TMHMNotCompatible + call FarPrintText + jr .didnt_learn + +.can_learn + callab KnowsMove + jr c, .didnt_learn + + predef LearnMove + ld a, b + and a + jr z, .didnt_learn + + ld c, HAPPINESS_LEARNMOVE + callab ChangeHappiness + jr .learned + +.didnt_learn + call ExitMenu + and a + ret + +.learned + call ExitMenu + scf + ret + +.MenuDataHeader: ; 0x4930a + db $40 ; flags + db 12, 00 ; start coords + db 17, 19 ; end coords diff --git a/event/poisonstep_pals.asm b/event/poisonstep_pals.asm new file mode 100644 index 000000000..c556ba498 --- /dev/null +++ b/event/poisonstep_pals.asm @@ -0,0 +1,48 @@ +LoadPoisonBGPals: ; cbcdd + call .LoadPals + ld a, [hCGB] + and a + ret nz + ret ; ???? + +.LoadPals: ; cbce5 + ld a, [hCGB] + and a + jr nz, .cgb + ld a, [TimeOfDayPal] + and $3 + cp $3 + ld a, %00000000 + jr z, .convert_pals + ld a, %10101010 + +.convert_pals + call DmgToCgbBGPals + ld c, 4 + call DelayFrames + callba _UpdateTimePals + ret + +.cgb + ld a, [rSVBK] + push af + ld a, $5 + ld [rSVBK], a + ld hl, BGPals + ld c, $20 +.loop +; RGB 28, 21, 31 + ld a, (palred 28 + palgreen 21 + palblue 31) % $100 + ld [hli], a + ld a, (palred 28 + palgreen 21 + palblue 31) / $100 + ld [hli], a + dec c + jr nz, .loop + pop af + ld [rSVBK], a + ld a, $1 + ld [hCGBPalUpdate], a + ld c, 4 + call DelayFrames + callba _UpdateTimePals + ret diff --git a/event/print_photo.asm b/event/print_photo.asm new file mode 100755 index 000000000..448910355 --- /dev/null +++ b/event/print_photo.asm @@ -0,0 +1,61 @@ +PhotoStudio: ; 16dc7 + ld hl, .Text_AskWhichMon + call PrintText + callba SelectMonFromParty + jr c, .cancel + ld a, [CurPartySpecies] + cp EGG + jr z, .egg + + ld hl, .Text_HoldStill + call PrintText + call DisableSpriteUpdates + callba PrintPartymon + call ReturnToMapWithSpeechTextbox + ld a, [hPrinter] + and a + jr nz, .cancel + ld hl, .Text_Presto + jr .print_text + +.cancel + ld hl, .Text_NoPicture + jr .print_text + +.egg + ld hl, .Text_Egg + +.print_text + call PrintText + ret +; 16e04 + +.Text_AskWhichMon: ; 0x16e04 + ; Which #MON should I photo- graph? + text_jump UnknownText_0x1be024 + db "@" +; 0x16e09 + +.Text_HoldStill: ; 0x16e09 + ; All righty. Hold still for a bit. + text_jump UnknownText_0x1be047 + db "@" +; 0x16e0e + +.Text_Presto: ; 0x16e0e + ; Presto! All done. Come again, OK? + text_jump UnknownText_0x1be06a + db "@" +; 0x16e13 + +.Text_NoPicture: ; 0x16e13 + ; Oh, no picture? Come again, OK? + text_jump UnknownText_0x1c0000 + db "@" +; 0x16e18 + +.Text_Egg: ; 0x16e18 + ; An EGG? My talent is worth more… + text_jump UnknownText_0x1c0021 + db "@" +; 0x16e1d diff --git a/event/photo.asm b/event/print_unown.asm old mode 100755 new mode 100644 similarity index 75% rename from event/photo.asm rename to event/print_unown.asm index fea57a368..5e0162bad --- a/event/photo.asm +++ b/event/print_unown.asm @@ -214,9 +214,9 @@ UnownDexVacantString: ; 16d9c UnownDexATile: ; 16d9c -INCBIN "gfx/unknown/bold_a.1bpp" +INCBIN "gfx/printer/bold_a.1bpp" UnownDexBTile: ; 16da4 -INCBIN "gfx/unknown/bold_b.1bpp" +INCBIN "gfx/printer/bold_b.1bpp" ; 16dac PlaceUnownPrinterFrontpic: ; 16dac @@ -231,65 +231,3 @@ PlaceUnownPrinterFrontpic: ; 16dac predef PlaceGraphic ret ; 16dc7 - -PhotoStudio: ; 16dc7 - ld hl, .Text_AskWhichMon - call PrintText - callba SelectMonFromParty - jr c, .cancel - ld a, [CurPartySpecies] - cp EGG - jr z, .egg - - ld hl, .Text_HoldStill - call PrintText - call DisableSpriteUpdates - callba PrintPartymon - call ReturnToMapWithSpeechTextbox - ld a, [hPrinter] - and a - jr nz, .cancel - ld hl, .Text_Presto - jr .print_text - -.cancel - ld hl, .Text_NoPicture - jr .print_text - -.egg - ld hl, .Text_Egg - -.print_text - call PrintText - ret -; 16e04 - -.Text_AskWhichMon: ; 0x16e04 - ; Which #MON should I photo- graph? - text_jump UnknownText_0x1be024 - db "@" -; 0x16e09 - -.Text_HoldStill: ; 0x16e09 - ; All righty. Hold still for a bit. - text_jump UnknownText_0x1be047 - db "@" -; 0x16e0e - -.Text_Presto: ; 0x16e0e - ; Presto! All done. Come again, OK? - text_jump UnknownText_0x1be06a - db "@" -; 0x16e13 - -.Text_NoPicture: ; 0x16e13 - ; Oh, no picture? Come again, OK? - text_jump UnknownText_0x1c0000 - db "@" -; 0x16e18 - -.Text_Egg: ; 0x16e18 - ; An EGG? My talent is worth more… - text_jump UnknownText_0x1c0021 - db "@" -; 0x16e1d diff --git a/event/print_unown_2.asm b/event/print_unown_2.asm new file mode 100644 index 000000000..057db5176 --- /dev/null +++ b/event/print_unown_2.asm @@ -0,0 +1,111 @@ +RotateUnownFrontpic: ; e0000 +; something to do with Unown printer + push de + xor a + call GetSRAMBank + ld hl, sScratch + ld bc, 0 +.loop + push bc + push hl + push bc + ld de, wd002 + call .Copy + call .Rotate + ld hl, UnownPrinter_OverworldMapRectangle + pop bc + add hl, bc + add hl, bc + ld a, [hli] + ld e, a + ld d, [hl] + ld hl, wd012 + call .Copy + pop hl + ld bc, $10 + add hl, bc + pop bc + inc c + ld a, c + cp 7 * 7 + jr c, .loop + + ld hl, OverworldMap + ld de, sScratch + ld bc, 7 * 7 tiles + call CopyBytes + pop hl + ld de, sScratch + ld c, 7 * 7 + ld a, [hROMBank] + ld b, a + call Get2bpp + call CloseSRAM + ret + +.Copy: ; e004e + ld c, $10 +.loop_copy + ld a, [hli] + ld [de], a + inc de + dec c + jr nz, .loop_copy + ret + +.Rotate: ; e0057 + ld hl, wd012 + ld e, %10000000 + ld d, 8 +.loop_decompress + push hl + ld hl, wd002 + call .CountSetBit + pop hl + ld a, b + ld [hli], a + push hl + ld hl, wd003 + call .CountSetBit + pop hl + ld a, b + ld [hli], a + srl e + dec d + jr nz, .loop_decompress + ret + +.CountSetBit: ; e0078 + ld b, 0 + ld c, 8 +.loop_count + ld a, [hli] + and e + jr z, .clear + scf + jr .apply + +.clear + and a + +.apply + rr b + inc hl + dec c + jr nz, .loop_count + ret + +overworldmaprect: MACRO +y = 0 +rept \1 +x = \1 * (\2 +- 1) + y +rept \2 + dw OverworldMap tile x +x = x +- \2 +endr +y = y + 1 +endr +endm + +UnownPrinter_OverworldMapRectangle: ; e008b + overworldmaprect 7, 7 diff --git a/event/special.asm b/event/special.asm index f1228abc6..71323499e 100755 --- a/event/special.asm +++ b/event/special.asm @@ -229,3 +229,7 @@ CopyPokemonName_Buffer1_Buffer3: ; 746e ld de, StringBuffer3 ld bc, PKMN_NAME_LENGTH jp CopyBytes + +Predef1: ; 747a +; not used + ret diff --git a/event/std_collision.asm b/event/std_collision.asm new file mode 100644 index 000000000..17b1e49b2 --- /dev/null +++ b/event/std_collision.asm @@ -0,0 +1,29 @@ +CheckFacingTileForStd:: ; 1365b +; Checks to see if the tile you're facing has a std script associated with it. If so, executes the script and returns carry. + ld a, c + ld de, 3 + ld hl, TileCollisionStdScripts + call IsInArray + jr nc, .notintable + + ld a, jumpstd_command + ld [wJumpStdScriptBuffer], a + inc hl + ld a, [hli] + ld [wJumpStdScriptBuffer + 1], a + ld a, [hli] + ld [wJumpStdScriptBuffer + 2], a + ld a, BANK(Script_JumpStdFromRAM) + ld hl, Script_JumpStdFromRAM + call CallScript + scf + ret + +.notintable + xor a + ret + +INCLUDE "data/collision_stdscripts.asm" + +Script_JumpStdFromRAM: ; 0x1369a + jump wJumpStdScriptBuffer diff --git a/event/unown.asm b/event/unown.asm index efd4c74f5..1be858bd6 100644 --- a/event/unown.asm +++ b/event/unown.asm @@ -1,5 +1,3 @@ - - SpecialHoOhChamber: ; 0x8addb ld hl, PartySpecies ld a, [hl] diff --git a/gfx/card_flip/card_flip.tilemap b/gfx/card_flip/card_flip.tilemap new file mode 100644 index 000000000..f6cdbefb1 Binary files /dev/null and b/gfx/card_flip/card_flip.tilemap differ diff --git a/gfx/credits.asm b/gfx/credits.asm new file mode 100644 index 000000000..2477bd562 --- /dev/null +++ b/gfx/credits.asm @@ -0,0 +1,7 @@ +CreditsBorderGFX: INCBIN "gfx/credits/border.2bpp" + +CreditsMonsGFX: +CreditsPichuGFX: INCBIN "gfx/credits/pichu.2bpp" +CreditsSmoochumGFX: INCBIN "gfx/credits/smoochum.2bpp" +CreditsDittoGFX: INCBIN "gfx/credits/ditto.2bpp" +CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.2bpp" diff --git a/gfx/emotes.asm b/gfx/emotes.asm new file mode 100644 index 000000000..1de06de2c --- /dev/null +++ b/gfx/emotes.asm @@ -0,0 +1,12 @@ +ShockEmote: INCBIN "gfx/emotes/shock.2bpp" +QuestionEmote: INCBIN "gfx/emotes/question.2bpp" +HappyEmote: INCBIN "gfx/emotes/happy.2bpp" +SadEmote: INCBIN "gfx/emotes/sad.2bpp" +HeartEmote: INCBIN "gfx/emotes/heart.2bpp" +BoltEmote: INCBIN "gfx/emotes/bolt.2bpp" +SleepEmote: INCBIN "gfx/emotes/sleep.2bpp" +FishEmote: INCBIN "gfx/emotes/fish.2bpp" +JumpShadowGFX: INCBIN "gfx/overworld/shadow.2bpp" +FishingRodGFX: INCBIN "gfx/overworld/fishing_rod.2bpp" +BoulderDustGFX: INCBIN "gfx/overworld/boulder_dust.2bpp" +GrassRustleGFX: INCBIN "gfx/overworld/grass_rustle.2bpp" diff --git a/gfx/font.asm b/gfx/font.asm index f2efefd37..867619a9c 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -50,16 +50,16 @@ TownMapGFX: ; f8ba0 INCBIN "gfx/pokegear/town_map.2bpp.lz" ; f8ea4 -WeekdayKanjiGFX: ; unused kanji -INCBIN "gfx/font/weekday_kanji.2bpp" +UnusedWeekdayKanjiGFX: ; unused kanji +INCBIN "gfx/font/unused_weekday_kanji.2bpp" ; f8f24 OverworldPhoneIconGFX: ; f8f24 -INCBIN "gfx/mobile/overworld_phone_icon.2bpp" +INCBIN "gfx/font/overworld_phone_icon.2bpp" ; f8f34 -GFX_f8f34: ; unused bold letters + unown chars -INCBIN "gfx/unknown/bold_font.1bpp" +UnusedBoldFontGFX: ; unused bold letters + unown chars +INCBIN "gfx/font/unused_bold_font.1bpp" ; f9204 TextBoxSpaceGFX: ; f9204 diff --git a/gfx/mobile/overworld_phone_icon.png b/gfx/font/overworld_phone_icon.png similarity index 100% rename from gfx/mobile/overworld_phone_icon.png rename to gfx/font/overworld_phone_icon.png diff --git a/gfx/unknown/bold_font.png b/gfx/font/unused_bold_font.png similarity index 100% rename from gfx/unknown/bold_font.png rename to gfx/font/unused_bold_font.png diff --git a/gfx/font/weekday_kanji.png b/gfx/font/unused_weekday_kanji.png similarity index 100% rename from gfx/font/weekday_kanji.png rename to gfx/font/unused_weekday_kanji.png diff --git a/gfx/unknown/ascii_font.png b/gfx/mobile/ascii_font.png similarity index 100% rename from gfx/unknown/ascii_font.png rename to gfx/mobile/ascii_font.png diff --git a/gfx/unknown/down_arrow.png b/gfx/mobile/down_arrow.png similarity index 100% rename from gfx/unknown/down_arrow.png rename to gfx/mobile/down_arrow.png diff --git a/gfx/unknown/egg_animated.2bpp.lz.3eaf004f b/gfx/mobile/electro_ball.2bpp.lz.3eaf004f similarity index 100% rename from gfx/unknown/egg_animated.2bpp.lz.3eaf004f rename to gfx/mobile/electro_ball.2bpp.lz.3eaf004f diff --git a/gfx/unknown/egg_animated.png b/gfx/mobile/electro_ball.png similarity index 100% rename from gfx/unknown/egg_animated.png rename to gfx/mobile/electro_ball.png diff --git a/gfx/unknown/egg_animated_nonmatching.png b/gfx/mobile/electro_ball_nonmatching.png similarity index 100% rename from gfx/unknown/egg_animated_nonmatching.png rename to gfx/mobile/electro_ball_nonmatching.png diff --git a/gfx/unknown/mobile_splash.attrmap b/gfx/mobile/mobile_splash.attrmap similarity index 100% rename from gfx/unknown/mobile_splash.attrmap rename to gfx/mobile/mobile_splash.attrmap diff --git a/gfx/unknown/mobile_splash.png b/gfx/mobile/mobile_splash.png similarity index 100% rename from gfx/unknown/mobile_splash.png rename to gfx/mobile/mobile_splash.png diff --git a/gfx/unknown/mobile_splash.tilemap b/gfx/mobile/mobile_splash.tilemap similarity index 100% rename from gfx/unknown/mobile_splash.tilemap rename to gfx/mobile/mobile_splash.tilemap diff --git a/gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4 b/gfx/mobile/pichu_animated.2bpp.lz.5d6d2ad4 similarity index 100% rename from gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4 rename to gfx/mobile/pichu_animated.2bpp.lz.5d6d2ad4 diff --git a/gfx/unknown/pichu_animated.png b/gfx/mobile/pichu_animated.png similarity index 100% rename from gfx/unknown/pichu_animated.png rename to gfx/mobile/pichu_animated.png diff --git a/gfx/unknown/up_arrow.png b/gfx/mobile/up_arrow.png similarity index 100% rename from gfx/unknown/up_arrow.png rename to gfx/mobile/up_arrow.png diff --git a/gfx/special/celebi/1.png b/gfx/overworld/celebi/1.png similarity index 100% rename from gfx/special/celebi/1.png rename to gfx/overworld/celebi/1.png diff --git a/gfx/special/celebi/2.png b/gfx/overworld/celebi/2.png similarity index 100% rename from gfx/special/celebi/2.png rename to gfx/overworld/celebi/2.png diff --git a/gfx/special/celebi/3.png b/gfx/overworld/celebi/3.png similarity index 100% rename from gfx/special/celebi/3.png rename to gfx/overworld/celebi/3.png diff --git a/gfx/special/celebi/4.png b/gfx/overworld/celebi/4.png similarity index 100% rename from gfx/special/celebi/4.png rename to gfx/overworld/celebi/4.png diff --git a/gfx/overworld_font.asm b/gfx/overworld_font.asm new file mode 100644 index 000000000..203b18fa0 --- /dev/null +++ b/gfx/overworld_font.asm @@ -0,0 +1,17 @@ +LoadOverworldFont:: ; 106594 + ld de, .font + ld hl, VTiles1 + lb bc, BANK(.font), $80 + call Get2bpp + ld de, .space + ld hl, VTiles2 tile $7f + lb bc, BANK(.space), 1 + call Get2bpp + ret +; 1065ad + +.font +INCBIN "gfx/font/overworld.2bpp" + +.space +INCBIN "gfx/font/space.2bpp" diff --git a/gfx/pics/animation.asm b/gfx/pics/animation.asm index aa32fbe94..2f348fbfb 100644 --- a/gfx/pics/animation.asm +++ b/gfx/pics/animation.asm @@ -1,6 +1,5 @@ ; Pic animation arrangement. - AnimateMon_Slow_Normal: ; d0000 hlcoord 12, 0 ld a, [wBattleMode] @@ -53,23 +52,18 @@ AnimateMon_Unused: ; d003a ret ; d0042 - -POKEANIM: MACRO +pokeanim: MACRO rept _NARG - ; Workaround for a bug where macro args can't come after the start of a symbol if !def(\1_POKEANIM) \1_POKEANIM equs "PokeAnim_\1_" endc - db (\1_POKEANIM - PokeAnim_SetupCommands) / 2 shift endr - db (PokeAnim_Finish_ - PokeAnim_SetupCommands) / 2 ENDM - PokeAnims: ; d0042 dw .Slow dw .Normal @@ -81,15 +75,15 @@ PokeAnims: ; d0042 dw .Egg1 dw .Egg2 -.Slow: POKEANIM StereoCry, Setup2, Play -.Normal: POKEANIM StereoCry, Setup, Play -.Menu: POKEANIM CryNoWait, Setup, Play, SetWait, Wait, Extra, Play -.Trade: POKEANIM Extra, Play2, Extra, Play, SetWait, Wait, Cry, Setup, Play -.Evolve: POKEANIM Extra, Play, SetWait, Wait, CryNoWait, Setup, Play -.Hatch: POKEANIM Extra, Play, CryNoWait, Setup, Play, SetWait, Wait, Extra, Play -.Unused: POKEANIM CryNoWait, Setup, Play, SetWait, Wait, Extra, Play -.Egg1: POKEANIM Setup, Play -.Egg2: POKEANIM Extra, Play +.Slow: pokeanim StereoCry, Setup2, Play +.Normal: pokeanim StereoCry, Setup, Play +.Menu: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Extra, Play +.Trade: pokeanim Extra, Play2, Extra, Play, SetWait, Wait, Cry, Setup, Play +.Evolve: pokeanim Extra, Play, SetWait, Wait, CryNoWait, Setup, Play +.Hatch: pokeanim Extra, Play, CryNoWait, Setup, Play, SetWait, Wait, Extra, Play +.Unused: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Extra, Play +.Egg1: pokeanim Setup, Play +.Egg2: pokeanim Extra, Play AnimateFrontpic: ; d008e diff --git a/gfx/pics/pic_pointers.asm b/gfx/pics/pic_pointers.asm index 2a6a2699a..58631e09a 100644 --- a/gfx/pics/pic_pointers.asm +++ b/gfx/pics/pic_pointers.asm @@ -1,511 +1,511 @@ PicPointers:: ; entries correspond to constants/pokemon_constants.asm, two apiece - add_pic BulbasaurFrontpic - add_pic BulbasaurBackpic - add_pic IvysaurFrontpic - add_pic IvysaurBackpic - add_pic VenusaurFrontpic - add_pic VenusaurBackpic - add_pic CharmanderFrontpic - add_pic CharmanderBackpic - add_pic CharmeleonFrontpic - add_pic CharmeleonBackpic - add_pic CharizardFrontpic - add_pic CharizardBackpic - add_pic SquirtleFrontpic - add_pic SquirtleBackpic - add_pic WartortleFrontpic - add_pic WartortleBackpic - add_pic BlastoiseFrontpic - add_pic BlastoiseBackpic - add_pic CaterpieFrontpic - add_pic CaterpieBackpic - add_pic MetapodFrontpic - add_pic MetapodBackpic - add_pic ButterfreeFrontpic - add_pic ButterfreeBackpic - add_pic WeedleFrontpic - add_pic WeedleBackpic - add_pic KakunaFrontpic - add_pic KakunaBackpic - add_pic BeedrillFrontpic - add_pic BeedrillBackpic - add_pic PidgeyFrontpic - add_pic PidgeyBackpic - add_pic PidgeottoFrontpic - add_pic PidgeottoBackpic - add_pic PidgeotFrontpic - add_pic PidgeotBackpic - add_pic RattataFrontpic - add_pic RattataBackpic - add_pic RaticateFrontpic - add_pic RaticateBackpic - add_pic SpearowFrontpic - add_pic SpearowBackpic - add_pic FearowFrontpic - add_pic FearowBackpic - add_pic EkansFrontpic - add_pic EkansBackpic - add_pic ArbokFrontpic - add_pic ArbokBackpic - add_pic PikachuFrontpic - add_pic PikachuBackpic - add_pic RaichuFrontpic - add_pic RaichuBackpic - add_pic SandshrewFrontpic - add_pic SandshrewBackpic - add_pic SandslashFrontpic - add_pic SandslashBackpic - add_pic NidoranFFrontpic - add_pic NidoranFBackpic - add_pic NidorinaFrontpic - add_pic NidorinaBackpic - add_pic NidoqueenFrontpic - add_pic NidoqueenBackpic - add_pic NidoranMFrontpic - add_pic NidoranMBackpic - add_pic NidorinoFrontpic - add_pic NidorinoBackpic - add_pic NidokingFrontpic - add_pic NidokingBackpic - add_pic ClefairyFrontpic - add_pic ClefairyBackpic - add_pic ClefableFrontpic - add_pic ClefableBackpic - add_pic VulpixFrontpic - add_pic VulpixBackpic - add_pic NinetalesFrontpic - add_pic NinetalesBackpic - add_pic JigglypuffFrontpic - add_pic JigglypuffBackpic - add_pic WigglytuffFrontpic - add_pic WigglytuffBackpic - add_pic ZubatFrontpic - add_pic ZubatBackpic - add_pic GolbatFrontpic - add_pic GolbatBackpic - add_pic OddishFrontpic - add_pic OddishBackpic - add_pic GloomFrontpic - add_pic GloomBackpic - add_pic VileplumeFrontpic - add_pic VileplumeBackpic - add_pic ParasFrontpic - add_pic ParasBackpic - add_pic ParasectFrontpic - add_pic ParasectBackpic - add_pic VenonatFrontpic - add_pic VenonatBackpic - add_pic VenomothFrontpic - add_pic VenomothBackpic - add_pic DiglettFrontpic - add_pic DiglettBackpic - add_pic DugtrioFrontpic - add_pic DugtrioBackpic - add_pic MeowthFrontpic - add_pic MeowthBackpic - add_pic PersianFrontpic - add_pic PersianBackpic - add_pic PsyduckFrontpic - add_pic PsyduckBackpic - add_pic GolduckFrontpic - add_pic GolduckBackpic - add_pic MankeyFrontpic - add_pic MankeyBackpic - add_pic PrimeapeFrontpic - add_pic PrimeapeBackpic - add_pic GrowlitheFrontpic - add_pic GrowlitheBackpic - add_pic ArcanineFrontpic - add_pic ArcanineBackpic - add_pic PoliwagFrontpic - add_pic PoliwagBackpic - add_pic PoliwhirlFrontpic - add_pic PoliwhirlBackpic - add_pic PoliwrathFrontpic - add_pic PoliwrathBackpic - add_pic AbraFrontpic - add_pic AbraBackpic - add_pic KadabraFrontpic - add_pic KadabraBackpic - add_pic AlakazamFrontpic - add_pic AlakazamBackpic - add_pic MachopFrontpic - add_pic MachopBackpic - add_pic MachokeFrontpic - add_pic MachokeBackpic - add_pic MachampFrontpic - add_pic MachampBackpic - add_pic BellsproutFrontpic - add_pic BellsproutBackpic - add_pic WeepinbellFrontpic - add_pic WeepinbellBackpic - add_pic VictreebelFrontpic - add_pic VictreebelBackpic - add_pic TentacoolFrontpic - add_pic TentacoolBackpic - add_pic TentacruelFrontpic - add_pic TentacruelBackpic - add_pic GeodudeFrontpic - add_pic GeodudeBackpic - add_pic GravelerFrontpic - add_pic GravelerBackpic - add_pic GolemFrontpic - add_pic GolemBackpic - add_pic PonytaFrontpic - add_pic PonytaBackpic - add_pic RapidashFrontpic - add_pic RapidashBackpic - add_pic SlowpokeFrontpic - add_pic SlowpokeBackpic - add_pic SlowbroFrontpic - add_pic SlowbroBackpic - add_pic MagnemiteFrontpic - add_pic MagnemiteBackpic - add_pic MagnetonFrontpic - add_pic MagnetonBackpic - add_pic FarfetchDFrontpic - add_pic FarfetchDBackpic - add_pic DoduoFrontpic - add_pic DoduoBackpic - add_pic DodrioFrontpic - add_pic DodrioBackpic - add_pic SeelFrontpic - add_pic SeelBackpic - add_pic DewgongFrontpic - add_pic DewgongBackpic - add_pic GrimerFrontpic - add_pic GrimerBackpic - add_pic MukFrontpic - add_pic MukBackpic - add_pic ShellderFrontpic - add_pic ShellderBackpic - add_pic CloysterFrontpic - add_pic CloysterBackpic - add_pic GastlyFrontpic - add_pic GastlyBackpic - add_pic HaunterFrontpic - add_pic HaunterBackpic - add_pic GengarFrontpic - add_pic GengarBackpic - add_pic OnixFrontpic - add_pic OnixBackpic - add_pic DrowzeeFrontpic - add_pic DrowzeeBackpic - add_pic HypnoFrontpic - add_pic HypnoBackpic - add_pic KrabbyFrontpic - add_pic KrabbyBackpic - add_pic KinglerFrontpic - add_pic KinglerBackpic - add_pic VoltorbFrontpic - add_pic VoltorbBackpic - add_pic ElectrodeFrontpic - add_pic ElectrodeBackpic - add_pic ExeggcuteFrontpic - add_pic ExeggcuteBackpic - add_pic ExeggutorFrontpic - add_pic ExeggutorBackpic - add_pic CuboneFrontpic - add_pic CuboneBackpic - add_pic MarowakFrontpic - add_pic MarowakBackpic - add_pic HitmonleeFrontpic - add_pic HitmonleeBackpic - add_pic HitmonchanFrontpic - add_pic HitmonchanBackpic - add_pic LickitungFrontpic - add_pic LickitungBackpic - add_pic KoffingFrontpic - add_pic KoffingBackpic - add_pic WeezingFrontpic - add_pic WeezingBackpic - add_pic RhyhornFrontpic - add_pic RhyhornBackpic - add_pic RhydonFrontpic - add_pic RhydonBackpic - add_pic ChanseyFrontpic - add_pic ChanseyBackpic - add_pic TangelaFrontpic - add_pic TangelaBackpic - add_pic KangaskhanFrontpic - add_pic KangaskhanBackpic - add_pic HorseaFrontpic - add_pic HorseaBackpic - add_pic SeadraFrontpic - add_pic SeadraBackpic - add_pic GoldeenFrontpic - add_pic GoldeenBackpic - add_pic SeakingFrontpic - add_pic SeakingBackpic - add_pic StaryuFrontpic - add_pic StaryuBackpic - add_pic StarmieFrontpic - add_pic StarmieBackpic - add_pic MrMimeFrontpic - add_pic MrMimeBackpic - add_pic ScytherFrontpic - add_pic ScytherBackpic - add_pic JynxFrontpic - add_pic JynxBackpic - add_pic ElectabuzzFrontpic - add_pic ElectabuzzBackpic - add_pic MagmarFrontpic - add_pic MagmarBackpic - add_pic PinsirFrontpic - add_pic PinsirBackpic - add_pic TaurosFrontpic - add_pic TaurosBackpic - add_pic MagikarpFrontpic - add_pic MagikarpBackpic - add_pic GyaradosFrontpic - add_pic GyaradosBackpic - add_pic LaprasFrontpic - add_pic LaprasBackpic - add_pic DittoFrontpic - add_pic DittoBackpic - add_pic EeveeFrontpic - add_pic EeveeBackpic - add_pic VaporeonFrontpic - add_pic VaporeonBackpic - add_pic JolteonFrontpic - add_pic JolteonBackpic - add_pic FlareonFrontpic - add_pic FlareonBackpic - add_pic PorygonFrontpic - add_pic PorygonBackpic - add_pic OmanyteFrontpic - add_pic OmanyteBackpic - add_pic OmastarFrontpic - add_pic OmastarBackpic - add_pic KabutoFrontpic - add_pic KabutoBackpic - add_pic KabutopsFrontpic - add_pic KabutopsBackpic - add_pic AerodactylFrontpic - add_pic AerodactylBackpic - add_pic SnorlaxFrontpic - add_pic SnorlaxBackpic - add_pic ArticunoFrontpic - add_pic ArticunoBackpic - add_pic ZapdosFrontpic - add_pic ZapdosBackpic - add_pic MoltresFrontpic - add_pic MoltresBackpic - add_pic DratiniFrontpic - add_pic DratiniBackpic - add_pic DragonairFrontpic - add_pic DragonairBackpic - add_pic DragoniteFrontpic - add_pic DragoniteBackpic - add_pic MewtwoFrontpic - add_pic MewtwoBackpic - add_pic MewFrontpic - add_pic MewBackpic - add_pic ChikoritaFrontpic - add_pic ChikoritaBackpic - add_pic BayleefFrontpic - add_pic BayleefBackpic - add_pic MeganiumFrontpic - add_pic MeganiumBackpic - add_pic CyndaquilFrontpic - add_pic CyndaquilBackpic - add_pic QuilavaFrontpic - add_pic QuilavaBackpic - add_pic TyphlosionFrontpic - add_pic TyphlosionBackpic - add_pic TotodileFrontpic - add_pic TotodileBackpic - add_pic CroconawFrontpic - add_pic CroconawBackpic - add_pic FeraligatrFrontpic - add_pic FeraligatrBackpic - add_pic SentretFrontpic - add_pic SentretBackpic - add_pic FurretFrontpic - add_pic FurretBackpic - add_pic HoothootFrontpic - add_pic HoothootBackpic - add_pic NoctowlFrontpic - add_pic NoctowlBackpic - add_pic LedybaFrontpic - add_pic LedybaBackpic - add_pic LedianFrontpic - add_pic LedianBackpic - add_pic SpinarakFrontpic - add_pic SpinarakBackpic - add_pic AriadosFrontpic - add_pic AriadosBackpic - add_pic CrobatFrontpic - add_pic CrobatBackpic - add_pic ChinchouFrontpic - add_pic ChinchouBackpic - add_pic LanturnFrontpic - add_pic LanturnBackpic - add_pic PichuFrontpic - add_pic PichuBackpic - add_pic CleffaFrontpic - add_pic CleffaBackpic - add_pic IgglybuffFrontpic - add_pic IgglybuffBackpic - add_pic TogepiFrontpic - add_pic TogepiBackpic - add_pic TogeticFrontpic - add_pic TogeticBackpic - add_pic NatuFrontpic - add_pic NatuBackpic - add_pic XatuFrontpic - add_pic XatuBackpic - add_pic MareepFrontpic - add_pic MareepBackpic - add_pic FlaaffyFrontpic - add_pic FlaaffyBackpic - add_pic AmpharosFrontpic - add_pic AmpharosBackpic - add_pic BellossomFrontpic - add_pic BellossomBackpic - add_pic MarillFrontpic - add_pic MarillBackpic - add_pic AzumarillFrontpic - add_pic AzumarillBackpic - add_pic SudowoodoFrontpic - add_pic SudowoodoBackpic - add_pic PolitoedFrontpic - add_pic PolitoedBackpic - add_pic HoppipFrontpic - add_pic HoppipBackpic - add_pic SkiploomFrontpic - add_pic SkiploomBackpic - add_pic JumpluffFrontpic - add_pic JumpluffBackpic - add_pic AipomFrontpic - add_pic AipomBackpic - add_pic SunkernFrontpic - add_pic SunkernBackpic - add_pic SunfloraFrontpic - add_pic SunfloraBackpic - add_pic YanmaFrontpic - add_pic YanmaBackpic - add_pic WooperFrontpic - add_pic WooperBackpic - add_pic QuagsireFrontpic - add_pic QuagsireBackpic - add_pic EspeonFrontpic - add_pic EspeonBackpic - add_pic UmbreonFrontpic - add_pic UmbreonBackpic - add_pic MurkrowFrontpic - add_pic MurkrowBackpic - add_pic SlowkingFrontpic - add_pic SlowkingBackpic - add_pic MisdreavusFrontpic - add_pic MisdreavusBackpic + dba_pic BulbasaurFrontpic + dba_pic BulbasaurBackpic + dba_pic IvysaurFrontpic + dba_pic IvysaurBackpic + dba_pic VenusaurFrontpic + dba_pic VenusaurBackpic + dba_pic CharmanderFrontpic + dba_pic CharmanderBackpic + dba_pic CharmeleonFrontpic + dba_pic CharmeleonBackpic + dba_pic CharizardFrontpic + dba_pic CharizardBackpic + dba_pic SquirtleFrontpic + dba_pic SquirtleBackpic + dba_pic WartortleFrontpic + dba_pic WartortleBackpic + dba_pic BlastoiseFrontpic + dba_pic BlastoiseBackpic + dba_pic CaterpieFrontpic + dba_pic CaterpieBackpic + dba_pic MetapodFrontpic + dba_pic MetapodBackpic + dba_pic ButterfreeFrontpic + dba_pic ButterfreeBackpic + dba_pic WeedleFrontpic + dba_pic WeedleBackpic + dba_pic KakunaFrontpic + dba_pic KakunaBackpic + dba_pic BeedrillFrontpic + dba_pic BeedrillBackpic + dba_pic PidgeyFrontpic + dba_pic PidgeyBackpic + dba_pic PidgeottoFrontpic + dba_pic PidgeottoBackpic + dba_pic PidgeotFrontpic + dba_pic PidgeotBackpic + dba_pic RattataFrontpic + dba_pic RattataBackpic + dba_pic RaticateFrontpic + dba_pic RaticateBackpic + dba_pic SpearowFrontpic + dba_pic SpearowBackpic + dba_pic FearowFrontpic + dba_pic FearowBackpic + dba_pic EkansFrontpic + dba_pic EkansBackpic + dba_pic ArbokFrontpic + dba_pic ArbokBackpic + dba_pic PikachuFrontpic + dba_pic PikachuBackpic + dba_pic RaichuFrontpic + dba_pic RaichuBackpic + dba_pic SandshrewFrontpic + dba_pic SandshrewBackpic + dba_pic SandslashFrontpic + dba_pic SandslashBackpic + dba_pic NidoranFFrontpic + dba_pic NidoranFBackpic + dba_pic NidorinaFrontpic + dba_pic NidorinaBackpic + dba_pic NidoqueenFrontpic + dba_pic NidoqueenBackpic + dba_pic NidoranMFrontpic + dba_pic NidoranMBackpic + dba_pic NidorinoFrontpic + dba_pic NidorinoBackpic + dba_pic NidokingFrontpic + dba_pic NidokingBackpic + dba_pic ClefairyFrontpic + dba_pic ClefairyBackpic + dba_pic ClefableFrontpic + dba_pic ClefableBackpic + dba_pic VulpixFrontpic + dba_pic VulpixBackpic + dba_pic NinetalesFrontpic + dba_pic NinetalesBackpic + dba_pic JigglypuffFrontpic + dba_pic JigglypuffBackpic + dba_pic WigglytuffFrontpic + dba_pic WigglytuffBackpic + dba_pic ZubatFrontpic + dba_pic ZubatBackpic + dba_pic GolbatFrontpic + dba_pic GolbatBackpic + dba_pic OddishFrontpic + dba_pic OddishBackpic + dba_pic GloomFrontpic + dba_pic GloomBackpic + dba_pic VileplumeFrontpic + dba_pic VileplumeBackpic + dba_pic ParasFrontpic + dba_pic ParasBackpic + dba_pic ParasectFrontpic + dba_pic ParasectBackpic + dba_pic VenonatFrontpic + dba_pic VenonatBackpic + dba_pic VenomothFrontpic + dba_pic VenomothBackpic + dba_pic DiglettFrontpic + dba_pic DiglettBackpic + dba_pic DugtrioFrontpic + dba_pic DugtrioBackpic + dba_pic MeowthFrontpic + dba_pic MeowthBackpic + dba_pic PersianFrontpic + dba_pic PersianBackpic + dba_pic PsyduckFrontpic + dba_pic PsyduckBackpic + dba_pic GolduckFrontpic + dba_pic GolduckBackpic + dba_pic MankeyFrontpic + dba_pic MankeyBackpic + dba_pic PrimeapeFrontpic + dba_pic PrimeapeBackpic + dba_pic GrowlitheFrontpic + dba_pic GrowlitheBackpic + dba_pic ArcanineFrontpic + dba_pic ArcanineBackpic + dba_pic PoliwagFrontpic + dba_pic PoliwagBackpic + dba_pic PoliwhirlFrontpic + dba_pic PoliwhirlBackpic + dba_pic PoliwrathFrontpic + dba_pic PoliwrathBackpic + dba_pic AbraFrontpic + dba_pic AbraBackpic + dba_pic KadabraFrontpic + dba_pic KadabraBackpic + dba_pic AlakazamFrontpic + dba_pic AlakazamBackpic + dba_pic MachopFrontpic + dba_pic MachopBackpic + dba_pic MachokeFrontpic + dba_pic MachokeBackpic + dba_pic MachampFrontpic + dba_pic MachampBackpic + dba_pic BellsproutFrontpic + dba_pic BellsproutBackpic + dba_pic WeepinbellFrontpic + dba_pic WeepinbellBackpic + dba_pic VictreebelFrontpic + dba_pic VictreebelBackpic + dba_pic TentacoolFrontpic + dba_pic TentacoolBackpic + dba_pic TentacruelFrontpic + dba_pic TentacruelBackpic + dba_pic GeodudeFrontpic + dba_pic GeodudeBackpic + dba_pic GravelerFrontpic + dba_pic GravelerBackpic + dba_pic GolemFrontpic + dba_pic GolemBackpic + dba_pic PonytaFrontpic + dba_pic PonytaBackpic + dba_pic RapidashFrontpic + dba_pic RapidashBackpic + dba_pic SlowpokeFrontpic + dba_pic SlowpokeBackpic + dba_pic SlowbroFrontpic + dba_pic SlowbroBackpic + dba_pic MagnemiteFrontpic + dba_pic MagnemiteBackpic + dba_pic MagnetonFrontpic + dba_pic MagnetonBackpic + dba_pic FarfetchDFrontpic + dba_pic FarfetchDBackpic + dba_pic DoduoFrontpic + dba_pic DoduoBackpic + dba_pic DodrioFrontpic + dba_pic DodrioBackpic + dba_pic SeelFrontpic + dba_pic SeelBackpic + dba_pic DewgongFrontpic + dba_pic DewgongBackpic + dba_pic GrimerFrontpic + dba_pic GrimerBackpic + dba_pic MukFrontpic + dba_pic MukBackpic + dba_pic ShellderFrontpic + dba_pic ShellderBackpic + dba_pic CloysterFrontpic + dba_pic CloysterBackpic + dba_pic GastlyFrontpic + dba_pic GastlyBackpic + dba_pic HaunterFrontpic + dba_pic HaunterBackpic + dba_pic GengarFrontpic + dba_pic GengarBackpic + dba_pic OnixFrontpic + dba_pic OnixBackpic + dba_pic DrowzeeFrontpic + dba_pic DrowzeeBackpic + dba_pic HypnoFrontpic + dba_pic HypnoBackpic + dba_pic KrabbyFrontpic + dba_pic KrabbyBackpic + dba_pic KinglerFrontpic + dba_pic KinglerBackpic + dba_pic VoltorbFrontpic + dba_pic VoltorbBackpic + dba_pic ElectrodeFrontpic + dba_pic ElectrodeBackpic + dba_pic ExeggcuteFrontpic + dba_pic ExeggcuteBackpic + dba_pic ExeggutorFrontpic + dba_pic ExeggutorBackpic + dba_pic CuboneFrontpic + dba_pic CuboneBackpic + dba_pic MarowakFrontpic + dba_pic MarowakBackpic + dba_pic HitmonleeFrontpic + dba_pic HitmonleeBackpic + dba_pic HitmonchanFrontpic + dba_pic HitmonchanBackpic + dba_pic LickitungFrontpic + dba_pic LickitungBackpic + dba_pic KoffingFrontpic + dba_pic KoffingBackpic + dba_pic WeezingFrontpic + dba_pic WeezingBackpic + dba_pic RhyhornFrontpic + dba_pic RhyhornBackpic + dba_pic RhydonFrontpic + dba_pic RhydonBackpic + dba_pic ChanseyFrontpic + dba_pic ChanseyBackpic + dba_pic TangelaFrontpic + dba_pic TangelaBackpic + dba_pic KangaskhanFrontpic + dba_pic KangaskhanBackpic + dba_pic HorseaFrontpic + dba_pic HorseaBackpic + dba_pic SeadraFrontpic + dba_pic SeadraBackpic + dba_pic GoldeenFrontpic + dba_pic GoldeenBackpic + dba_pic SeakingFrontpic + dba_pic SeakingBackpic + dba_pic StaryuFrontpic + dba_pic StaryuBackpic + dba_pic StarmieFrontpic + dba_pic StarmieBackpic + dba_pic MrMimeFrontpic + dba_pic MrMimeBackpic + dba_pic ScytherFrontpic + dba_pic ScytherBackpic + dba_pic JynxFrontpic + dba_pic JynxBackpic + dba_pic ElectabuzzFrontpic + dba_pic ElectabuzzBackpic + dba_pic MagmarFrontpic + dba_pic MagmarBackpic + dba_pic PinsirFrontpic + dba_pic PinsirBackpic + dba_pic TaurosFrontpic + dba_pic TaurosBackpic + dba_pic MagikarpFrontpic + dba_pic MagikarpBackpic + dba_pic GyaradosFrontpic + dba_pic GyaradosBackpic + dba_pic LaprasFrontpic + dba_pic LaprasBackpic + dba_pic DittoFrontpic + dba_pic DittoBackpic + dba_pic EeveeFrontpic + dba_pic EeveeBackpic + dba_pic VaporeonFrontpic + dba_pic VaporeonBackpic + dba_pic JolteonFrontpic + dba_pic JolteonBackpic + dba_pic FlareonFrontpic + dba_pic FlareonBackpic + dba_pic PorygonFrontpic + dba_pic PorygonBackpic + dba_pic OmanyteFrontpic + dba_pic OmanyteBackpic + dba_pic OmastarFrontpic + dba_pic OmastarBackpic + dba_pic KabutoFrontpic + dba_pic KabutoBackpic + dba_pic KabutopsFrontpic + dba_pic KabutopsBackpic + dba_pic AerodactylFrontpic + dba_pic AerodactylBackpic + dba_pic SnorlaxFrontpic + dba_pic SnorlaxBackpic + dba_pic ArticunoFrontpic + dba_pic ArticunoBackpic + dba_pic ZapdosFrontpic + dba_pic ZapdosBackpic + dba_pic MoltresFrontpic + dba_pic MoltresBackpic + dba_pic DratiniFrontpic + dba_pic DratiniBackpic + dba_pic DragonairFrontpic + dba_pic DragonairBackpic + dba_pic DragoniteFrontpic + dba_pic DragoniteBackpic + dba_pic MewtwoFrontpic + dba_pic MewtwoBackpic + dba_pic MewFrontpic + dba_pic MewBackpic + dba_pic ChikoritaFrontpic + dba_pic ChikoritaBackpic + dba_pic BayleefFrontpic + dba_pic BayleefBackpic + dba_pic MeganiumFrontpic + dba_pic MeganiumBackpic + dba_pic CyndaquilFrontpic + dba_pic CyndaquilBackpic + dba_pic QuilavaFrontpic + dba_pic QuilavaBackpic + dba_pic TyphlosionFrontpic + dba_pic TyphlosionBackpic + dba_pic TotodileFrontpic + dba_pic TotodileBackpic + dba_pic CroconawFrontpic + dba_pic CroconawBackpic + dba_pic FeraligatrFrontpic + dba_pic FeraligatrBackpic + dba_pic SentretFrontpic + dba_pic SentretBackpic + dba_pic FurretFrontpic + dba_pic FurretBackpic + dba_pic HoothootFrontpic + dba_pic HoothootBackpic + dba_pic NoctowlFrontpic + dba_pic NoctowlBackpic + dba_pic LedybaFrontpic + dba_pic LedybaBackpic + dba_pic LedianFrontpic + dba_pic LedianBackpic + dba_pic SpinarakFrontpic + dba_pic SpinarakBackpic + dba_pic AriadosFrontpic + dba_pic AriadosBackpic + dba_pic CrobatFrontpic + dba_pic CrobatBackpic + dba_pic ChinchouFrontpic + dba_pic ChinchouBackpic + dba_pic LanturnFrontpic + dba_pic LanturnBackpic + dba_pic PichuFrontpic + dba_pic PichuBackpic + dba_pic CleffaFrontpic + dba_pic CleffaBackpic + dba_pic IgglybuffFrontpic + dba_pic IgglybuffBackpic + dba_pic TogepiFrontpic + dba_pic TogepiBackpic + dba_pic TogeticFrontpic + dba_pic TogeticBackpic + dba_pic NatuFrontpic + dba_pic NatuBackpic + dba_pic XatuFrontpic + dba_pic XatuBackpic + dba_pic MareepFrontpic + dba_pic MareepBackpic + dba_pic FlaaffyFrontpic + dba_pic FlaaffyBackpic + dba_pic AmpharosFrontpic + dba_pic AmpharosBackpic + dba_pic BellossomFrontpic + dba_pic BellossomBackpic + dba_pic MarillFrontpic + dba_pic MarillBackpic + dba_pic AzumarillFrontpic + dba_pic AzumarillBackpic + dba_pic SudowoodoFrontpic + dba_pic SudowoodoBackpic + dba_pic PolitoedFrontpic + dba_pic PolitoedBackpic + dba_pic HoppipFrontpic + dba_pic HoppipBackpic + dba_pic SkiploomFrontpic + dba_pic SkiploomBackpic + dba_pic JumpluffFrontpic + dba_pic JumpluffBackpic + dba_pic AipomFrontpic + dba_pic AipomBackpic + dba_pic SunkernFrontpic + dba_pic SunkernBackpic + dba_pic SunfloraFrontpic + dba_pic SunfloraBackpic + dba_pic YanmaFrontpic + dba_pic YanmaBackpic + dba_pic WooperFrontpic + dba_pic WooperBackpic + dba_pic QuagsireFrontpic + dba_pic QuagsireBackpic + dba_pic EspeonFrontpic + dba_pic EspeonBackpic + dba_pic UmbreonFrontpic + dba_pic UmbreonBackpic + dba_pic MurkrowFrontpic + dba_pic MurkrowBackpic + dba_pic SlowkingFrontpic + dba_pic SlowkingBackpic + dba_pic MisdreavusFrontpic + dba_pic MisdreavusBackpic ; Unown pics have their own table. See UnownPicPointers dbw -1, -1 dbw -1, -1 - add_pic WobbuffetFrontpic - add_pic WobbuffetBackpic - add_pic GirafarigFrontpic - add_pic GirafarigBackpic - add_pic PinecoFrontpic - add_pic PinecoBackpic - add_pic ForretressFrontpic - add_pic ForretressBackpic - add_pic DunsparceFrontpic - add_pic DunsparceBackpic - add_pic GligarFrontpic - add_pic GligarBackpic - add_pic SteelixFrontpic - add_pic SteelixBackpic - add_pic SnubbullFrontpic - add_pic SnubbullBackpic - add_pic GranbullFrontpic - add_pic GranbullBackpic - add_pic QwilfishFrontpic - add_pic QwilfishBackpic - add_pic ScizorFrontpic - add_pic ScizorBackpic - add_pic ShuckleFrontpic - add_pic ShuckleBackpic - add_pic HeracrossFrontpic - add_pic HeracrossBackpic - add_pic SneaselFrontpic - add_pic SneaselBackpic - add_pic TeddiursaFrontpic - add_pic TeddiursaBackpic - add_pic UrsaringFrontpic - add_pic UrsaringBackpic - add_pic SlugmaFrontpic - add_pic SlugmaBackpic - add_pic MagcargoFrontpic - add_pic MagcargoBackpic - add_pic SwinubFrontpic - add_pic SwinubBackpic - add_pic PiloswineFrontpic - add_pic PiloswineBackpic - add_pic CorsolaFrontpic - add_pic CorsolaBackpic - add_pic RemoraidFrontpic - add_pic RemoraidBackpic - add_pic OctilleryFrontpic - add_pic OctilleryBackpic - add_pic DelibirdFrontpic - add_pic DelibirdBackpic - add_pic MantineFrontpic - add_pic MantineBackpic - add_pic SkarmoryFrontpic - add_pic SkarmoryBackpic - add_pic HoundourFrontpic - add_pic HoundourBackpic - add_pic HoundoomFrontpic - add_pic HoundoomBackpic - add_pic KingdraFrontpic - add_pic KingdraBackpic - add_pic PhanpyFrontpic - add_pic PhanpyBackpic - add_pic DonphanFrontpic - add_pic DonphanBackpic - add_pic Porygon2Frontpic - add_pic Porygon2Backpic - add_pic StantlerFrontpic - add_pic StantlerBackpic - add_pic SmeargleFrontpic - add_pic SmeargleBackpic - add_pic TyrogueFrontpic - add_pic TyrogueBackpic - add_pic HitmontopFrontpic - add_pic HitmontopBackpic - add_pic SmoochumFrontpic - add_pic SmoochumBackpic - add_pic ElekidFrontpic - add_pic ElekidBackpic - add_pic MagbyFrontpic - add_pic MagbyBackpic - add_pic MiltankFrontpic - add_pic MiltankBackpic - add_pic BlisseyFrontpic - add_pic BlisseyBackpic - add_pic RaikouFrontpic - add_pic RaikouBackpic - add_pic EnteiFrontpic - add_pic EnteiBackpic - add_pic SuicuneFrontpic - add_pic SuicuneBackpic - add_pic LarvitarFrontpic - add_pic LarvitarBackpic - add_pic PupitarFrontpic - add_pic PupitarBackpic - add_pic TyranitarFrontpic - add_pic TyranitarBackpic - add_pic LugiaFrontpic - add_pic LugiaBackpic - add_pic HoOhFrontpic - add_pic HoOhBackpic - add_pic CelebiFrontpic - add_pic CelebiBackpic + dba_pic WobbuffetFrontpic + dba_pic WobbuffetBackpic + dba_pic GirafarigFrontpic + dba_pic GirafarigBackpic + dba_pic PinecoFrontpic + dba_pic PinecoBackpic + dba_pic ForretressFrontpic + dba_pic ForretressBackpic + dba_pic DunsparceFrontpic + dba_pic DunsparceBackpic + dba_pic GligarFrontpic + dba_pic GligarBackpic + dba_pic SteelixFrontpic + dba_pic SteelixBackpic + dba_pic SnubbullFrontpic + dba_pic SnubbullBackpic + dba_pic GranbullFrontpic + dba_pic GranbullBackpic + dba_pic QwilfishFrontpic + dba_pic QwilfishBackpic + dba_pic ScizorFrontpic + dba_pic ScizorBackpic + dba_pic ShuckleFrontpic + dba_pic ShuckleBackpic + dba_pic HeracrossFrontpic + dba_pic HeracrossBackpic + dba_pic SneaselFrontpic + dba_pic SneaselBackpic + dba_pic TeddiursaFrontpic + dba_pic TeddiursaBackpic + dba_pic UrsaringFrontpic + dba_pic UrsaringBackpic + dba_pic SlugmaFrontpic + dba_pic SlugmaBackpic + dba_pic MagcargoFrontpic + dba_pic MagcargoBackpic + dba_pic SwinubFrontpic + dba_pic SwinubBackpic + dba_pic PiloswineFrontpic + dba_pic PiloswineBackpic + dba_pic CorsolaFrontpic + dba_pic CorsolaBackpic + dba_pic RemoraidFrontpic + dba_pic RemoraidBackpic + dba_pic OctilleryFrontpic + dba_pic OctilleryBackpic + dba_pic DelibirdFrontpic + dba_pic DelibirdBackpic + dba_pic MantineFrontpic + dba_pic MantineBackpic + dba_pic SkarmoryFrontpic + dba_pic SkarmoryBackpic + dba_pic HoundourFrontpic + dba_pic HoundourBackpic + dba_pic HoundoomFrontpic + dba_pic HoundoomBackpic + dba_pic KingdraFrontpic + dba_pic KingdraBackpic + dba_pic PhanpyFrontpic + dba_pic PhanpyBackpic + dba_pic DonphanFrontpic + dba_pic DonphanBackpic + dba_pic Porygon2Frontpic + dba_pic Porygon2Backpic + dba_pic StantlerFrontpic + dba_pic StantlerBackpic + dba_pic SmeargleFrontpic + dba_pic SmeargleBackpic + dba_pic TyrogueFrontpic + dba_pic TyrogueBackpic + dba_pic HitmontopFrontpic + dba_pic HitmontopBackpic + dba_pic SmoochumFrontpic + dba_pic SmoochumBackpic + dba_pic ElekidFrontpic + dba_pic ElekidBackpic + dba_pic MagbyFrontpic + dba_pic MagbyBackpic + dba_pic MiltankFrontpic + dba_pic MiltankBackpic + dba_pic BlisseyFrontpic + dba_pic BlisseyBackpic + dba_pic RaikouFrontpic + dba_pic RaikouBackpic + dba_pic EnteiFrontpic + dba_pic EnteiBackpic + dba_pic SuicuneFrontpic + dba_pic SuicuneBackpic + dba_pic LarvitarFrontpic + dba_pic LarvitarBackpic + dba_pic PupitarFrontpic + dba_pic PupitarBackpic + dba_pic TyranitarFrontpic + dba_pic TyranitarBackpic + dba_pic LugiaFrontpic + dba_pic LugiaBackpic + dba_pic HoOhFrontpic + dba_pic HoOhBackpic + dba_pic CelebiFrontpic + dba_pic CelebiBackpic dbw -1, -1 ; unused dbw -1, -1 ; unused - add_pic EggPic + dba_pic EggPic dbw -1, -1 ; unused diff --git a/gfx/pics/unown_pic_pointers.asm b/gfx/pics/unown_pic_pointers.asm index c5072c903..1ae0da6b6 100644 --- a/gfx/pics/unown_pic_pointers.asm +++ b/gfx/pics/unown_pic_pointers.asm @@ -1,54 +1,54 @@ UnownPicPointers:: ; entries correspond to Unown letters, two apiece - add_pic UnownAFrontpic - add_pic UnownABackpic - add_pic UnownBFrontpic - add_pic UnownBBackpic - add_pic UnownCFrontpic - add_pic UnownCBackpic - add_pic UnownDFrontpic - add_pic UnownDBackpic - add_pic UnownEFrontpic - add_pic UnownEBackpic - add_pic UnownFFrontpic - add_pic UnownFBackpic - add_pic UnownGFrontpic - add_pic UnownGBackpic - add_pic UnownHFrontpic - add_pic UnownHBackpic - add_pic UnownIFrontpic - add_pic UnownIBackpic - add_pic UnownJFrontpic - add_pic UnownJBackpic - add_pic UnownKFrontpic - add_pic UnownKBackpic - add_pic UnownLFrontpic - add_pic UnownLBackpic - add_pic UnownMFrontpic - add_pic UnownMBackpic - add_pic UnownNFrontpic - add_pic UnownNBackpic - add_pic UnownOFrontpic - add_pic UnownOBackpic - add_pic UnownPFrontpic - add_pic UnownPBackpic - add_pic UnownQFrontpic - add_pic UnownQBackpic - add_pic UnownRFrontpic - add_pic UnownRBackpic - add_pic UnownSFrontpic - add_pic UnownSBackpic - add_pic UnownTFrontpic - add_pic UnownTBackpic - add_pic UnownUFrontpic - add_pic UnownUBackpic - add_pic UnownVFrontpic - add_pic UnownVBackpic - add_pic UnownWFrontpic - add_pic UnownWBackpic - add_pic UnownXFrontpic - add_pic UnownXBackpic - add_pic UnownYFrontpic - add_pic UnownYBackpic - add_pic UnownZFrontpic - add_pic UnownZBackpic + dba_pic UnownAFrontpic + dba_pic UnownABackpic + dba_pic UnownBFrontpic + dba_pic UnownBBackpic + dba_pic UnownCFrontpic + dba_pic UnownCBackpic + dba_pic UnownDFrontpic + dba_pic UnownDBackpic + dba_pic UnownEFrontpic + dba_pic UnownEBackpic + dba_pic UnownFFrontpic + dba_pic UnownFBackpic + dba_pic UnownGFrontpic + dba_pic UnownGBackpic + dba_pic UnownHFrontpic + dba_pic UnownHBackpic + dba_pic UnownIFrontpic + dba_pic UnownIBackpic + dba_pic UnownJFrontpic + dba_pic UnownJBackpic + dba_pic UnownKFrontpic + dba_pic UnownKBackpic + dba_pic UnownLFrontpic + dba_pic UnownLBackpic + dba_pic UnownMFrontpic + dba_pic UnownMBackpic + dba_pic UnownNFrontpic + dba_pic UnownNBackpic + dba_pic UnownOFrontpic + dba_pic UnownOBackpic + dba_pic UnownPFrontpic + dba_pic UnownPBackpic + dba_pic UnownQFrontpic + dba_pic UnownQBackpic + dba_pic UnownRFrontpic + dba_pic UnownRBackpic + dba_pic UnownSFrontpic + dba_pic UnownSBackpic + dba_pic UnownTFrontpic + dba_pic UnownTBackpic + dba_pic UnownUFrontpic + dba_pic UnownUBackpic + dba_pic UnownVFrontpic + dba_pic UnownVBackpic + dba_pic UnownWFrontpic + dba_pic UnownWBackpic + dba_pic UnownXFrontpic + dba_pic UnownXBackpic + dba_pic UnownYFrontpic + dba_pic UnownYBackpic + dba_pic UnownZFrontpic + dba_pic UnownZBackpic diff --git a/gfx/unknown/bold_a.png b/gfx/printer/bold_a.png similarity index 100% rename from gfx/unknown/bold_a.png rename to gfx/printer/bold_a.png diff --git a/gfx/unknown/bold_b.png b/gfx/printer/bold_b.png similarity index 100% rename from gfx/unknown/bold_b.png rename to gfx/printer/bold_b.png diff --git a/gfx/mobile/hp.png b/gfx/printer/hp.png similarity index 100% rename from gfx/mobile/hp.png rename to gfx/printer/hp.png diff --git a/gfx/mobile/lv.png b/gfx/printer/lv.png similarity index 100% rename from gfx/mobile/lv.png rename to gfx/printer/lv.png diff --git a/gfx/special/celebi/leaf.png b/gfx/special/celebi/leaf.png deleted file mode 100644 index b10e0cf8c..000000000 Binary files a/gfx/special/celebi/leaf.png and /dev/null differ diff --git a/gfx/sprites.asm b/gfx/sprites.asm index f7740d6a6..318f7506e 100644 --- a/gfx/sprites.asm +++ b/gfx/sprites.asm @@ -1,108 +1,108 @@ SECTION "Sprites 1", ROMX -ChrisSpriteGFX: INCBIN "gfx/sprites/chris.2bpp" ; c0000 -ChrisBikeSpriteGFX: INCBIN "gfx/sprites/chris_bike.2bpp" ; c0180 -GameboyKidSpriteGFX: INCBIN "gfx/sprites/gameboy_kid.2bpp" ; c0300 -SilverSpriteGFX: INCBIN "gfx/sprites/silver.2bpp" ; c03c0 -OakSpriteGFX: INCBIN "gfx/sprites/oak.2bpp" ; c0540 -RedSpriteGFX: INCBIN "gfx/sprites/red.2bpp" ; c06c0 -BlueSpriteGFX: INCBIN "gfx/sprites/blue.2bpp" ; c0840 -BillSpriteGFX: INCBIN "gfx/sprites/bill.2bpp" ; c09c0 -ElderSpriteGFX: INCBIN "gfx/sprites/elder.2bpp" ; c0b40 -JanineSpriteGFX: INCBIN "gfx/sprites/janine.2bpp" ; c0cc0 -KurtSpriteGFX: INCBIN "gfx/sprites/kurt.2bpp" ; c0e40 -MomSpriteGFX: INCBIN "gfx/sprites/mom.2bpp" ; c0fc0 -BlaineSpriteGFX: INCBIN "gfx/sprites/blaine.2bpp" ; c1140 -RedsMomSpriteGFX: INCBIN "gfx/sprites/reds_mom.2bpp" ; c12c0 -DaisySpriteGFX: INCBIN "gfx/sprites/daisy.2bpp" ; c1440 -ElmSpriteGFX: INCBIN "gfx/sprites/elm.2bpp" ; c15c0 -WillSpriteGFX: INCBIN "gfx/sprites/will.2bpp" ; c1740 -FalknerSpriteGFX: INCBIN "gfx/sprites/falkner.2bpp" ; c1800 -WhitneySpriteGFX: INCBIN "gfx/sprites/whitney.2bpp" ; c1980 -BugsySpriteGFX: INCBIN "gfx/sprites/bugsy.2bpp" ; c1b00 -MortySpriteGFX: INCBIN "gfx/sprites/morty.2bpp" ; c1c80 -ChuckSpriteGFX: INCBIN "gfx/sprites/chuck.2bpp" ; c1e00 -JasmineSpriteGFX: INCBIN "gfx/sprites/jasmine.2bpp" ; c1f80 -PryceSpriteGFX: INCBIN "gfx/sprites/pryce.2bpp" ; c2100 -ClairSpriteGFX: INCBIN "gfx/sprites/clair.2bpp" ; c2280 -BrockSpriteGFX: INCBIN "gfx/sprites/brock.2bpp" ; c2400 -KarenSpriteGFX: INCBIN "gfx/sprites/karen.2bpp" ; c2580 -BrunoSpriteGFX: INCBIN "gfx/sprites/bruno.2bpp" ; c2640 -MistySpriteGFX: INCBIN "gfx/sprites/misty.2bpp" ; c27c0 -LanceSpriteGFX: INCBIN "gfx/sprites/lance.2bpp" ; c2940 -SurgeSpriteGFX: INCBIN "gfx/sprites/surge.2bpp" ; c2ac0 -ErikaSpriteGFX: INCBIN "gfx/sprites/erika.2bpp" ; c2c40 -KogaSpriteGFX: INCBIN "gfx/sprites/koga.2bpp" ; c2dc0 -SabrinaSpriteGFX: INCBIN "gfx/sprites/sabrina.2bpp" ; c2f40 -CooltrainerMSpriteGFX: INCBIN "gfx/sprites/cooltrainer_m.2bpp" ; c30c0 -CooltrainerFSpriteGFX: INCBIN "gfx/sprites/cooltrainer_f.2bpp" ; c3240 -BugCatcherSpriteGFX: INCBIN "gfx/sprites/bug_catcher.2bpp" ; c33c0 -TwinSpriteGFX: INCBIN "gfx/sprites/twin.2bpp" ; c3540 -YoungsterSpriteGFX: INCBIN "gfx/sprites/youngster.2bpp" ; c36c0 -LassSpriteGFX: INCBIN "gfx/sprites/lass.2bpp" ; c3840 -TeacherSpriteGFX: INCBIN "gfx/sprites/teacher.2bpp" ; c39c0 -BuenaSpriteGFX: INCBIN "gfx/sprites/buena.2bpp" ; c3b40 -SuperNerdSpriteGFX: INCBIN "gfx/sprites/super_nerd.2bpp" ; c3cc0 -RockerSpriteGFX: INCBIN "gfx/sprites/rocker.2bpp" ; c3e40 +ChrisSpriteGFX:: INCBIN "gfx/sprites/chris.2bpp" ; c0000 +ChrisBikeSpriteGFX:: INCBIN "gfx/sprites/chris_bike.2bpp" ; c0180 +GameboyKidSpriteGFX:: INCBIN "gfx/sprites/gameboy_kid.2bpp" ; c0300 +SilverSpriteGFX:: INCBIN "gfx/sprites/silver.2bpp" ; c03c0 +OakSpriteGFX:: INCBIN "gfx/sprites/oak.2bpp" ; c0540 +RedSpriteGFX:: INCBIN "gfx/sprites/red.2bpp" ; c06c0 +BlueSpriteGFX:: INCBIN "gfx/sprites/blue.2bpp" ; c0840 +BillSpriteGFX:: INCBIN "gfx/sprites/bill.2bpp" ; c09c0 +ElderSpriteGFX:: INCBIN "gfx/sprites/elder.2bpp" ; c0b40 +JanineSpriteGFX:: INCBIN "gfx/sprites/janine.2bpp" ; c0cc0 +KurtSpriteGFX:: INCBIN "gfx/sprites/kurt.2bpp" ; c0e40 +MomSpriteGFX:: INCBIN "gfx/sprites/mom.2bpp" ; c0fc0 +BlaineSpriteGFX:: INCBIN "gfx/sprites/blaine.2bpp" ; c1140 +RedsMomSpriteGFX:: INCBIN "gfx/sprites/reds_mom.2bpp" ; c12c0 +DaisySpriteGFX:: INCBIN "gfx/sprites/daisy.2bpp" ; c1440 +ElmSpriteGFX:: INCBIN "gfx/sprites/elm.2bpp" ; c15c0 +WillSpriteGFX:: INCBIN "gfx/sprites/will.2bpp" ; c1740 +FalknerSpriteGFX:: INCBIN "gfx/sprites/falkner.2bpp" ; c1800 +WhitneySpriteGFX:: INCBIN "gfx/sprites/whitney.2bpp" ; c1980 +BugsySpriteGFX:: INCBIN "gfx/sprites/bugsy.2bpp" ; c1b00 +MortySpriteGFX:: INCBIN "gfx/sprites/morty.2bpp" ; c1c80 +ChuckSpriteGFX:: INCBIN "gfx/sprites/chuck.2bpp" ; c1e00 +JasmineSpriteGFX:: INCBIN "gfx/sprites/jasmine.2bpp" ; c1f80 +PryceSpriteGFX:: INCBIN "gfx/sprites/pryce.2bpp" ; c2100 +ClairSpriteGFX:: INCBIN "gfx/sprites/clair.2bpp" ; c2280 +BrockSpriteGFX:: INCBIN "gfx/sprites/brock.2bpp" ; c2400 +KarenSpriteGFX:: INCBIN "gfx/sprites/karen.2bpp" ; c2580 +BrunoSpriteGFX:: INCBIN "gfx/sprites/bruno.2bpp" ; c2640 +MistySpriteGFX:: INCBIN "gfx/sprites/misty.2bpp" ; c27c0 +LanceSpriteGFX:: INCBIN "gfx/sprites/lance.2bpp" ; c2940 +SurgeSpriteGFX:: INCBIN "gfx/sprites/surge.2bpp" ; c2ac0 +ErikaSpriteGFX:: INCBIN "gfx/sprites/erika.2bpp" ; c2c40 +KogaSpriteGFX:: INCBIN "gfx/sprites/koga.2bpp" ; c2dc0 +SabrinaSpriteGFX:: INCBIN "gfx/sprites/sabrina.2bpp" ; c2f40 +CooltrainerMSpriteGFX:: INCBIN "gfx/sprites/cooltrainer_m.2bpp" ; c30c0 +CooltrainerFSpriteGFX:: INCBIN "gfx/sprites/cooltrainer_f.2bpp" ; c3240 +BugCatcherSpriteGFX:: INCBIN "gfx/sprites/bug_catcher.2bpp" ; c33c0 +TwinSpriteGFX:: INCBIN "gfx/sprites/twin.2bpp" ; c3540 +YoungsterSpriteGFX:: INCBIN "gfx/sprites/youngster.2bpp" ; c36c0 +LassSpriteGFX:: INCBIN "gfx/sprites/lass.2bpp" ; c3840 +TeacherSpriteGFX:: INCBIN "gfx/sprites/teacher.2bpp" ; c39c0 +BuenaSpriteGFX:: INCBIN "gfx/sprites/buena.2bpp" ; c3b40 +SuperNerdSpriteGFX:: INCBIN "gfx/sprites/super_nerd.2bpp" ; c3cc0 +RockerSpriteGFX:: INCBIN "gfx/sprites/rocker.2bpp" ; c3e40 SECTION "Sprites 2", ROMX -PokefanMSpriteGFX: INCBIN "gfx/sprites/pokefan_m.2bpp" ; c4000 -PokefanFSpriteGFX: INCBIN "gfx/sprites/pokefan_f.2bpp" ; c4180 -GrampsSpriteGFX: INCBIN "gfx/sprites/gramps.2bpp" ; c4300 -GrannySpriteGFX: INCBIN "gfx/sprites/granny.2bpp" ; c4480 -SwimmerGuySpriteGFX: INCBIN "gfx/sprites/swimmer_guy.2bpp" ; c4600 -SwimmerGirlSpriteGFX: INCBIN "gfx/sprites/swimmer_girl.2bpp" ; c4780 -BigSnorlaxSpriteGFX: INCBIN "gfx/sprites/big_snorlax.2bpp" ; c4900 -SurfingPikachuSpriteGFX: INCBIN "gfx/sprites/surfing_pikachu.2bpp" ; c4980 -RocketSpriteGFX: INCBIN "gfx/sprites/rocket.2bpp" ; c4b00 -RocketGirlSpriteGFX: INCBIN "gfx/sprites/rocket_girl.2bpp" ; c4c80 -NurseSpriteGFX: INCBIN "gfx/sprites/nurse.2bpp" ; c4e00 -LinkReceptionistSpriteGFX: INCBIN "gfx/sprites/link_receptionist.2bpp" ; c4ec0 -ClerkSpriteGFX: INCBIN "gfx/sprites/clerk.2bpp" ; c5040 -FisherSpriteGFX: INCBIN "gfx/sprites/fisher.2bpp" ; c51c0 -FishingGuruSpriteGFX: INCBIN "gfx/sprites/fishing_guru.2bpp" ; c5340 -ScientistSpriteGFX: INCBIN "gfx/sprites/scientist.2bpp" ; c54c0 -KimonoGirlSpriteGFX: INCBIN "gfx/sprites/kimono_girl.2bpp" ; c5640 -SageSpriteGFX: INCBIN "gfx/sprites/sage.2bpp" ; c57c0 -UnusedGuySpriteGFX: INCBIN "gfx/sprites/unused_guy.2bpp" ; c5940 -GentlemanSpriteGFX: INCBIN "gfx/sprites/gentleman.2bpp" ; c5ac0 -BlackBeltSpriteGFX: INCBIN "gfx/sprites/black_belt.2bpp" ; c5c40 -ReceptionistSpriteGFX: INCBIN "gfx/sprites/receptionist.2bpp" ; c5dc0 -OfficerSpriteGFX: INCBIN "gfx/sprites/officer.2bpp" ; c5f40 -CalSpriteGFX: INCBIN "gfx/sprites/cal.2bpp" ; c60c0 -SlowpokeSpriteGFX: INCBIN "gfx/sprites/slowpoke.2bpp" ; c6240 -CaptainSpriteGFX: INCBIN "gfx/sprites/captain.2bpp" ; c6280 -BigLaprasSpriteGFX: INCBIN "gfx/sprites/big_lapras.2bpp" ; c6400 -GymGuySpriteGFX: INCBIN "gfx/sprites/gym_guy.2bpp" ; c6480 -SailorSpriteGFX: INCBIN "gfx/sprites/sailor.2bpp" ; c6600 -BikerSpriteGFX: INCBIN "gfx/sprites/biker.2bpp" ; c6780 -PharmacistSpriteGFX: INCBIN "gfx/sprites/pharmacist.2bpp" ; c6900 -MonsterSpriteGFX: INCBIN "gfx/sprites/monster.2bpp" ; c6a80 -FairySpriteGFX: INCBIN "gfx/sprites/fairy.2bpp" ; c6c00 -BirdSpriteGFX: INCBIN "gfx/sprites/bird.2bpp" ; c6d80 -DragonSpriteGFX: INCBIN "gfx/sprites/dragon.2bpp" ; c6f00 -BigOnixSpriteGFX: INCBIN "gfx/sprites/big_onix.2bpp" ; c7080 -N64SpriteGFX: INCBIN "gfx/sprites/n64.2bpp" ; c7140 -SudowoodoSpriteGFX: INCBIN "gfx/sprites/sudowoodo.2bpp" ; c7180 -SurfSpriteGFX: INCBIN "gfx/sprites/surf.2bpp" ; c7200 -PokeBallSpriteGFX: INCBIN "gfx/sprites/poke_ball.2bpp" ; c7380 -PokedexSpriteGFX: INCBIN "gfx/sprites/pokedex.2bpp" ; c7500 -PaperSpriteGFX: INCBIN "gfx/sprites/paper.2bpp" ; c7680 -VirtualBoySpriteGFX: INCBIN "gfx/sprites/virtual_boy.2bpp" ; c7800 -OldLinkReceptionistSpriteGFX: INCBIN "gfx/sprites/old_link_receptionist.2bpp" ; c7840 -RockSpriteGFX: INCBIN "gfx/sprites/rock.2bpp" ; c7880 -BoulderSpriteGFX: INCBIN "gfx/sprites/boulder.2bpp" ; c78c0 -SnesSpriteGFX: INCBIN "gfx/sprites/snes.2bpp" ; c7900 -FamicomSpriteGFX: INCBIN "gfx/sprites/famicom.2bpp" ; c7940 -FruitTreeSpriteGFX: INCBIN "gfx/sprites/fruit_tree.2bpp" ; c7980 -GoldTrophySpriteGFX: INCBIN "gfx/sprites/gold_trophy.2bpp" ; c79c0 -SilverTrophySpriteGFX: INCBIN "gfx/sprites/silver_trophy.2bpp" ; c7a00 -KrisSpriteGFX: INCBIN "gfx/sprites/kris.2bpp" ; c7a40 -KrisBikeSpriteGFX: INCBIN "gfx/sprites/kris_bike.2bpp" ; c7bc0 -KurtOutsideSpriteGFX: INCBIN "gfx/sprites/kurt_outside.2bpp" ; c7d40 -SuicuneSpriteGFX: INCBIN "gfx/sprites/suicune.2bpp" ; c7e00 -EnteiSpriteGFX: INCBIN "gfx/sprites/entei.2bpp" ; c7e40 -RaikouSpriteGFX: INCBIN "gfx/sprites/raikou.2bpp" ; c7e80 -StandingYoungsterSpriteGFX: INCBIN "gfx/sprites/standing_youngster.2bpp" ; c7ec0 +PokefanMSpriteGFX:: INCBIN "gfx/sprites/pokefan_m.2bpp" ; c4000 +PokefanFSpriteGFX:: INCBIN "gfx/sprites/pokefan_f.2bpp" ; c4180 +GrampsSpriteGFX:: INCBIN "gfx/sprites/gramps.2bpp" ; c4300 +GrannySpriteGFX:: INCBIN "gfx/sprites/granny.2bpp" ; c4480 +SwimmerGuySpriteGFX:: INCBIN "gfx/sprites/swimmer_guy.2bpp" ; c4600 +SwimmerGirlSpriteGFX:: INCBIN "gfx/sprites/swimmer_girl.2bpp" ; c4780 +BigSnorlaxSpriteGFX:: INCBIN "gfx/sprites/big_snorlax.2bpp" ; c4900 +SurfingPikachuSpriteGFX:: INCBIN "gfx/sprites/surfing_pikachu.2bpp" ; c4980 +RocketSpriteGFX:: INCBIN "gfx/sprites/rocket.2bpp" ; c4b00 +RocketGirlSpriteGFX:: INCBIN "gfx/sprites/rocket_girl.2bpp" ; c4c80 +NurseSpriteGFX:: INCBIN "gfx/sprites/nurse.2bpp" ; c4e00 +LinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/link_receptionist.2bpp" ; c4ec0 +ClerkSpriteGFX:: INCBIN "gfx/sprites/clerk.2bpp" ; c5040 +FisherSpriteGFX:: INCBIN "gfx/sprites/fisher.2bpp" ; c51c0 +FishingGuruSpriteGFX:: INCBIN "gfx/sprites/fishing_guru.2bpp" ; c5340 +ScientistSpriteGFX:: INCBIN "gfx/sprites/scientist.2bpp" ; c54c0 +KimonoGirlSpriteGFX:: INCBIN "gfx/sprites/kimono_girl.2bpp" ; c5640 +SageSpriteGFX:: INCBIN "gfx/sprites/sage.2bpp" ; c57c0 +UnusedGuySpriteGFX:: INCBIN "gfx/sprites/unused_guy.2bpp" ; c5940 +GentlemanSpriteGFX:: INCBIN "gfx/sprites/gentleman.2bpp" ; c5ac0 +BlackBeltSpriteGFX:: INCBIN "gfx/sprites/black_belt.2bpp" ; c5c40 +ReceptionistSpriteGFX:: INCBIN "gfx/sprites/receptionist.2bpp" ; c5dc0 +OfficerSpriteGFX:: INCBIN "gfx/sprites/officer.2bpp" ; c5f40 +CalSpriteGFX:: INCBIN "gfx/sprites/cal.2bpp" ; c60c0 +SlowpokeSpriteGFX:: INCBIN "gfx/sprites/slowpoke.2bpp" ; c6240 +CaptainSpriteGFX:: INCBIN "gfx/sprites/captain.2bpp" ; c6280 +BigLaprasSpriteGFX:: INCBIN "gfx/sprites/big_lapras.2bpp" ; c6400 +GymGuySpriteGFX:: INCBIN "gfx/sprites/gym_guy.2bpp" ; c6480 +SailorSpriteGFX:: INCBIN "gfx/sprites/sailor.2bpp" ; c6600 +BikerSpriteGFX:: INCBIN "gfx/sprites/biker.2bpp" ; c6780 +PharmacistSpriteGFX:: INCBIN "gfx/sprites/pharmacist.2bpp" ; c6900 +MonsterSpriteGFX:: INCBIN "gfx/sprites/monster.2bpp" ; c6a80 +FairySpriteGFX:: INCBIN "gfx/sprites/fairy.2bpp" ; c6c00 +BirdSpriteGFX:: INCBIN "gfx/sprites/bird.2bpp" ; c6d80 +DragonSpriteGFX:: INCBIN "gfx/sprites/dragon.2bpp" ; c6f00 +BigOnixSpriteGFX:: INCBIN "gfx/sprites/big_onix.2bpp" ; c7080 +N64SpriteGFX:: INCBIN "gfx/sprites/n64.2bpp" ; c7140 +SudowoodoSpriteGFX:: INCBIN "gfx/sprites/sudowoodo.2bpp" ; c7180 +SurfSpriteGFX:: INCBIN "gfx/sprites/surf.2bpp" ; c7200 +PokeBallSpriteGFX:: INCBIN "gfx/sprites/poke_ball.2bpp" ; c7380 +PokedexSpriteGFX:: INCBIN "gfx/sprites/pokedex.2bpp" ; c7500 +PaperSpriteGFX:: INCBIN "gfx/sprites/paper.2bpp" ; c7680 +VirtualBoySpriteGFX:: INCBIN "gfx/sprites/virtual_boy.2bpp" ; c7800 +OldLinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/old_link_receptionist.2bpp" ; c7840 +RockSpriteGFX:: INCBIN "gfx/sprites/rock.2bpp" ; c7880 +BoulderSpriteGFX:: INCBIN "gfx/sprites/boulder.2bpp" ; c78c0 +SnesSpriteGFX:: INCBIN "gfx/sprites/snes.2bpp" ; c7900 +FamicomSpriteGFX:: INCBIN "gfx/sprites/famicom.2bpp" ; c7940 +FruitTreeSpriteGFX:: INCBIN "gfx/sprites/fruit_tree.2bpp" ; c7980 +GoldTrophySpriteGFX:: INCBIN "gfx/sprites/gold_trophy.2bpp" ; c79c0 +SilverTrophySpriteGFX:: INCBIN "gfx/sprites/silver_trophy.2bpp" ; c7a00 +KrisSpriteGFX:: INCBIN "gfx/sprites/kris.2bpp" ; c7a40 +KrisBikeSpriteGFX:: INCBIN "gfx/sprites/kris_bike.2bpp" ; c7bc0 +KurtOutsideSpriteGFX:: INCBIN "gfx/sprites/kurt_outside.2bpp" ; c7d40 +SuicuneSpriteGFX:: INCBIN "gfx/sprites/suicune.2bpp" ; c7e00 +EnteiSpriteGFX:: INCBIN "gfx/sprites/entei.2bpp" ; c7e40 +RaikouSpriteGFX:: INCBIN "gfx/sprites/raikou.2bpp" ; c7e80 +StandingYoungsterSpriteGFX:: INCBIN "gfx/sprites/standing_youngster.2bpp" ; c7ec0 diff --git a/gfx/unknown/unused_border.png b/gfx/trade/unused_gen_1_border_tiles.png similarity index 100% rename from gfx/unknown/unused_border.png rename to gfx/trade/unused_gen_1_border_tiles.png diff --git a/gfx/trainer_pic_pointers.asm b/gfx/trainer_pic_pointers.asm index fb1fe0755..201b44200 100644 --- a/gfx/trainer_pic_pointers.asm +++ b/gfx/trainer_pic_pointers.asm @@ -1,69 +1,69 @@ TrainerPicPointers:: ; entries correspond to trainer classes (see constants/trainer_constants.asm) - add_pic FalknerPic - add_pic WhitneyPic - add_pic BugsyPic - add_pic MortyPic - add_pic PrycePic - add_pic JasminePic - add_pic ChuckPic - add_pic ClairPic - add_pic Rival1Pic - add_pic PokemonProfPic - add_pic WillPic - add_pic CalPic - add_pic BrunoPic - add_pic KarenPic - add_pic KogaPic - add_pic ChampionPic - add_pic BrockPic - add_pic MistyPic - add_pic LtSurgePic - add_pic ScientistPic - add_pic ErikaPic - add_pic YoungsterPic - add_pic SchoolboyPic - add_pic BirdKeeperPic - add_pic LassPic - add_pic JaninePic - add_pic CooltrainermPic - add_pic CooltrainerfPic - add_pic BeautyPic - add_pic PokemaniacPic - add_pic GruntmPic - add_pic GentlemanPic - add_pic SkierPic - add_pic TeacherPic - add_pic SabrinaPic - add_pic BugCatcherPic - add_pic FisherPic - add_pic SwimmermPic - add_pic SwimmerfPic - add_pic SailorPic - add_pic SuperNerdPic - add_pic Rival2Pic - add_pic GuitaristPic - add_pic HikerPic - add_pic BikerPic - add_pic BlainePic - add_pic BurglarPic - add_pic FirebreatherPic - add_pic JugglerPic - add_pic BlackbeltTPic - add_pic ExecutivemPic - add_pic PsychicTPic - add_pic PicnickerPic - add_pic CamperPic - add_pic ExecutivefPic - add_pic SagePic - add_pic MediumPic - add_pic BoarderPic - add_pic PokefanmPic - add_pic KimonoGirlPic - add_pic TwinsPic - add_pic PokefanfPic - add_pic RedPic - add_pic BluePic - add_pic OfficerPic - add_pic GruntfPic - add_pic MysticalmanPic + dba_pic FalknerPic + dba_pic WhitneyPic + dba_pic BugsyPic + dba_pic MortyPic + dba_pic PrycePic + dba_pic JasminePic + dba_pic ChuckPic + dba_pic ClairPic + dba_pic Rival1Pic + dba_pic PokemonProfPic + dba_pic WillPic + dba_pic CalPic + dba_pic BrunoPic + dba_pic KarenPic + dba_pic KogaPic + dba_pic ChampionPic + dba_pic BrockPic + dba_pic MistyPic + dba_pic LtSurgePic + dba_pic ScientistPic + dba_pic ErikaPic + dba_pic YoungsterPic + dba_pic SchoolboyPic + dba_pic BirdKeeperPic + dba_pic LassPic + dba_pic JaninePic + dba_pic CooltrainermPic + dba_pic CooltrainerfPic + dba_pic BeautyPic + dba_pic PokemaniacPic + dba_pic GruntmPic + dba_pic GentlemanPic + dba_pic SkierPic + dba_pic TeacherPic + dba_pic SabrinaPic + dba_pic BugCatcherPic + dba_pic FisherPic + dba_pic SwimmermPic + dba_pic SwimmerfPic + dba_pic SailorPic + dba_pic SuperNerdPic + dba_pic Rival2Pic + dba_pic GuitaristPic + dba_pic HikerPic + dba_pic BikerPic + dba_pic BlainePic + dba_pic BurglarPic + dba_pic FirebreatherPic + dba_pic JugglerPic + dba_pic BlackbeltTPic + dba_pic ExecutivemPic + dba_pic PsychicTPic + dba_pic PicnickerPic + dba_pic CamperPic + dba_pic ExecutivefPic + dba_pic SagePic + dba_pic MediumPic + dba_pic BoarderPic + dba_pic PokefanmPic + dba_pic KimonoGirlPic + dba_pic TwinsPic + dba_pic PokefanfPic + dba_pic RedPic + dba_pic BluePic + dba_pic OfficerPic + dba_pic GruntfPic + dba_pic MysticalmanPic diff --git a/home.asm b/home.asm index 670f63f95..dc03faa2c 100644 --- a/home.asm +++ b/home.asm @@ -1,17 +1,23 @@ INCLUDE "includes.asm" + SECTION "NULL", ROM0 NULL:: + INCLUDE "rst.asm" + + INCLUDE "interrupts.asm" + SECTION "Header", ROM0 Start:: nop jp _Start + SECTION "Home", ROM0 INCLUDE "home/init.asm" @@ -40,9 +46,9 @@ INCLUDE "home/map.asm" InexplicablyEmptyFunction:: ; 2d43 ; Inexplicably empty. ; Seen in PredefPointers. - rept 16 +rept 16 nop - endr +endr ret ; 2d54 @@ -765,300 +771,7 @@ GetWeekday:: ; 3376 INCLUDE "home/pokedex_flags.asm" -NamesPointers:: ; 33ab - dba PokemonNames - dba MoveNames - dbw 0, 0 - dba ItemNames - dbw 0, PartyMonOT - dbw 0, OTPartyMonOT - dba TrainerClassNames - dbw $4, $4b52 ; within PackMenuGFX -; 33c3 - -GetName:: ; 33c3 -; Return name CurSpecies from name list wNamedObjectTypeBuffer in StringBuffer1. - - ld a, [hROMBank] - push af - push hl - push bc - push de - - ld a, [wNamedObjectTypeBuffer] - cp PKMN_NAME - jr nz, .NotPokeName - - ld a, [CurSpecies] - ld [wd265], a - call GetPokemonName - ld hl, PKMN_NAME_LENGTH - add hl, de - ld e, l - ld d, h - jr .done - -.NotPokeName: - ld a, [wNamedObjectTypeBuffer] - dec a - ld e, a - ld d, 0 - ld hl, NamesPointers - add hl, de - add hl, de - add hl, de - ld a, [hli] - rst Bankswitch - ld a, [hli] - ld h, [hl] - ld l, a - - ld a, [CurSpecies] - dec a - call GetNthString - - ld de, StringBuffer1 - ld bc, ITEM_NAME_LENGTH - call CopyBytes - -.done - ld a, e - ld [wUnusedD102], a - ld a, d - ld [wUnusedD102 + 1], a - - pop de - pop bc - pop hl - pop af - rst Bankswitch - ret -; 3411 - -GetNthString:: ; 3411 -; Return the address of the -; ath string starting from hl. - - and a - ret z - - push bc - ld b, a - ld c, "@" -.readChar - ld a, [hli] - cp c - jr nz, .readChar - dec b - jr nz, .readChar - pop bc - ret -; 3420 - -GetBasePokemonName:: ; 3420 -; Discards gender (Nidoran). - - push hl - call GetPokemonName - - ld hl, StringBuffer1 -.loop - ld a, [hl] - cp "@" - jr z, .quit - cp "♂" - jr z, .end - cp "♀" - jr z, .end - inc hl - jr .loop -.end - ld [hl], "@" -.quit - pop hl - ret - -; 343b - -GetPokemonName:: ; 343b -; Get Pokemon name wd265. - - ld a, [hROMBank] - push af - push hl - ld a, BANK(PokemonNames) - rst Bankswitch - -; Each name is ten characters - ld a, [wd265] - dec a - ld d, 0 - ld e, a - ld h, 0 - ld l, a - add hl, hl ; hl = hl * 4 - add hl, hl ; hl = hl * 4 - add hl, de ; hl = (hl*4) + de - add hl, hl ; hl = (5*hl) + (5*hl) - ld de, PokemonNames - add hl, de - -; Terminator - ld de, StringBuffer1 - push de - ld bc, PKMN_NAME_LENGTH - 1 - call CopyBytes - ld hl, StringBuffer1 + PKMN_NAME_LENGTH - 1 - ld [hl], "@" - pop de - - pop hl - pop af - rst Bankswitch - ret -; 3468 - -GetItemName:: ; 3468 -; Get item name wd265. - - push hl - push bc - ld a, [wd265] - - cp TM01 - jr nc, .TM - - ld [CurSpecies], a - ld a, ITEM_NAME - ld [wNamedObjectTypeBuffer], a - call GetName - jr .Copied -.TM: - call GetTMHMName -.Copied: - ld de, StringBuffer1 - pop bc - pop hl - ret -; 3487 - -GetTMHMName:: ; 3487 -; Get TM/HM name by item id wd265. - - push hl - push de - push bc - ld a, [wd265] - push af - -; TM/HM prefix - cp HM01 - push af - jr c, .TM - - ld hl, .HMText - ld bc, .HMTextEnd - .HMText - jr .asm_34a1 - -.TM: - ld hl, .TMText - ld bc, .TMTextEnd - .TMText - -.asm_34a1 - ld de, StringBuffer1 - call CopyBytes - -; TM/HM number - push de - ld a, [wd265] - ld c, a - callab GetTMHMNumber - pop de - -; HM numbers start from 51, not 1 - pop af - ld a, c - jr c, .asm_34b9 - sub NUM_TMS -.asm_34b9 - -; Divide and mod by 10 to get the top and bottom digits respectively - ld b, "0" -.mod10 - sub 10 - jr c, .asm_34c2 - inc b - jr .mod10 -.asm_34c2 - add 10 - - push af - ld a, b - ld [de], a - inc de - pop af - - ld b, "0" - add b - ld [de], a - -; End the string - inc de - ld a, "@" - ld [de], a - - pop af - ld [wd265], a - pop bc - pop de - pop hl - ret - -.TMText: - db "TM" -.TMTextEnd: - db "@" - -.HMText: - db "HM" -.HMTextEnd: - db "@" -; 34df - -IsHM:: ; 34df - cp HM01 - jr c, .NotHM - scf - ret -.NotHM: - and a - ret -; 34e7 - -IsHMMove:: ; 34e7 - ld hl, HMMoves - ld de, 1 - jp IsInArray - - -INCLUDE "data/hm_moves.asm" - - -GetMoveName:: ; 34f8 - push hl - - ld a, MOVE_NAME - ld [wNamedObjectTypeBuffer], a - - ld a, [wNamedObjectIndexBuffer] ; move id - ld [CurSpecies], a - - call GetName - ld de, StringBuffer1 - - pop hl - ret -; 350c +INCLUDE "home/names.asm" ScrollingMenu:: ; 350c call CopyMenuData2 @@ -1270,270 +983,7 @@ HandleStoneQueue:: ; 3567 ret ; 3600 -CheckTrainerBattle2:: ; 3600 - - ld a, [hROMBank] - push af - - call SwitchToMapScriptHeaderBank - call CheckTrainerBattle - - pop bc - ld a, b - rst Bankswitch - ret -; 360d - -CheckTrainerBattle:: ; 360d -; Check if any trainer on the map sees the player and wants to battle. - -; Skip the player object. - ld a, 1 - ld de, MapObjects + OBJECT_LENGTH - -.loop - -; Start a battle if the object: - - push af - push de - -; Has a sprite - ld hl, MAPOBJECT_SPRITE - add hl, de - ld a, [hl] - and a - jr z, .next - -; Is a trainer - ld hl, MAPOBJECT_COLOR - add hl, de - ld a, [hl] - and $f - cp $2 - jr nz, .next - -; Is visible on the map - ld hl, MAPOBJECT_OBJECT_STRUCT_ID - add hl, de - ld a, [hl] - cp -1 - jr z, .next - -; Is facing the player... - call GetObjectStruct - call FacingPlayerDistance_bc - jr nc, .next - -; ...within their sight range - ld hl, MAPOBJECT_RANGE - add hl, de - ld a, [hl] - cp b - jr c, .next - -; And hasn't already been beaten - push bc - push de - ld hl, MAPOBJECT_SCRIPT_POINTER - add hl, de - ld a, [hli] - ld h, [hl] - ld l, a - ld e, [hl] - inc hl - ld d, [hl] - ld b, CHECK_FLAG - call EventFlagAction - ld a, c - pop de - pop bc - and a - jr z, .startbattle - -.next - pop de - ld hl, OBJECT_LENGTH - add hl, de - ld d, h - ld e, l - - pop af - inc a - cp NUM_OBJECTS - jr nz, .loop - xor a - ret - -.startbattle - pop de - pop af - ld [hLastTalked], a - ld a, b - ld [EngineBuffer2], a - ld a, c - ld [EngineBuffer3], a - jr LoadTrainer_continue -; 3674 - -TalkToTrainer:: ; 3674 - ld a, 1 - ld [EngineBuffer2], a - ld a, -1 - ld [EngineBuffer3], a - -LoadTrainer_continue:: ; 367e - call GetMapScriptHeaderBank - ld [EngineBuffer1], a - - ld a, [hLastTalked] - call GetMapObject - - ld hl, MAPOBJECT_SCRIPT_POINTER - add hl, bc - ld a, [EngineBuffer1] - call GetFarHalfword - ld de, wTempTrainerHeader - ld bc, wTempTrainerHeaderEnd - wTempTrainerHeader - ld a, [EngineBuffer1] - call FarCopyBytes - xor a - ld [wRunningTrainerBattleScript], a - scf - ret -; 36a5 - -FacingPlayerDistance_bc:: ; 36a5 - - push de - call FacingPlayerDistance - ld b, d - ld c, e - pop de - ret -; 36ad - -FacingPlayerDistance:: ; 36ad -; Return carry if the sprite at bc is facing the player, -; and its distance in d. - - ld hl, OBJECT_NEXT_MAP_X ; x - add hl, bc - ld d, [hl] - - ld hl, OBJECT_NEXT_MAP_Y ; y - add hl, bc - ld e, [hl] - - ld a, [PlayerStandingMapX] - cp d - jr z, .CheckY - - ld a, [PlayerStandingMapY] - cp e - jr z, .CheckX - - and a - ret - -.CheckY: - ld a, [PlayerStandingMapY] - sub e - jr z, .NotFacing - jr nc, .Above - -; Below - cpl - inc a - ld d, a - ld e, OW_UP - jr .CheckFacing - -.Above: - ld d, a - ld e, OW_DOWN - jr .CheckFacing - -.CheckX: - ld a, [PlayerStandingMapX] - sub d - jr z, .NotFacing - jr nc, .Left - -; Right - cpl - inc a - ld d, a - ld e, OW_LEFT - jr .CheckFacing - -.Left: - ld d, a - ld e, OW_RIGHT - -.CheckFacing: - call GetSpriteDirection - cp e - jr nz, .NotFacing - scf - ret - -.NotFacing: - and a - ret -; 36f5 - -CheckTrainerFlag:: ; 36f5 - push bc - ld hl, OBJECT_MAP_OBJECT_INDEX - add hl, bc - ld a, [hl] - call GetMapObject - ld hl, MAPOBJECT_SCRIPT_POINTER - add hl, bc - ld a, [hli] - ld h, [hl] - ld l, a - call GetMapScriptHeaderBank - call GetFarHalfword - ld d, h - ld e, l - push de - ld b, CHECK_FLAG - call EventFlagAction - pop de - ld a, c - and a - pop bc - ret -; 3718 - -PrintWinLossText:: ; 3718 - ld a, [BattleType] - cp BATTLETYPE_CANLOSE - jr .canlose ; ?????????? - -; unreferenced - ld hl, wWinTextPointer - jr .ok - -.canlose - ld a, [wBattleResult] - ld hl, wWinTextPointer - and $f - jr z, .ok - ld hl, wLossTextPointer - -.ok - ld a, [hli] - ld h, [hl] - ld l, a - call GetMapScriptHeaderBank - call FarPrintText - call WaitBGMap - call WaitPressAorB_BlinkCursor - ret -; 3741 +INCLUDE "home/trainers.asm" IsAPokemon:: ; 3741 ; Return carry if species a is not a Pokemon. diff --git a/home/hm_moves.asm b/home/hm_moves.asm new file mode 100644 index 000000000..c4233d094 --- /dev/null +++ b/home/hm_moves.asm @@ -0,0 +1,27 @@ +; HM moves can't be forgotten + +IsHM:: ; 34df + cp HM01 + jr c, .NotHM + scf + ret +.NotHM: + and a + ret +; 34e7 + +IsHMMove:: ; 34e7 + ld hl, .HMMoves + ld de, 1 + jp IsInArray + +.HMMoves: ; 34f0 + db CUT + db FLY + db SURF + db STRENGTH + db FLASH + db WATERFALL + db WHIRLPOOL + db -1 ; end +; 34f8 diff --git a/home/names.asm b/home/names.asm new file mode 100644 index 000000000..bd90f7828 --- /dev/null +++ b/home/names.asm @@ -0,0 +1,278 @@ +NamesPointers:: ; 33ab +; entries correspond to GetName constants (see constants/misc_constants.asm) + dba PokemonNames + dba MoveNames + dbw 0, 0 + dba ItemNames + dbw 0, PartyMonOT + dbw 0, OTPartyMonOT + dba TrainerClassNames + dbw $4, $4b52 ; within PackMenuGFX +; 33c3 + +GetName:: ; 33c3 +; Return name CurSpecies from name list wNamedObjectTypeBuffer in StringBuffer1. + + ld a, [hROMBank] + push af + push hl + push bc + push de + + ld a, [wNamedObjectTypeBuffer] + cp PKMN_NAME + jr nz, .NotPokeName + + ld a, [CurSpecies] + ld [wd265], a + call GetPokemonName + ld hl, PKMN_NAME_LENGTH + add hl, de + ld e, l + ld d, h + jr .done + +.NotPokeName: + ld a, [wNamedObjectTypeBuffer] + dec a + ld e, a + ld d, 0 + ld hl, NamesPointers + add hl, de + add hl, de + add hl, de + ld a, [hli] + rst Bankswitch + ld a, [hli] + ld h, [hl] + ld l, a + + ld a, [CurSpecies] + dec a + call GetNthString + + ld de, StringBuffer1 + ld bc, ITEM_NAME_LENGTH + call CopyBytes + +.done + ld a, e + ld [wUnusedD102], a + ld a, d + ld [wUnusedD102 + 1], a + + pop de + pop bc + pop hl + pop af + rst Bankswitch + ret +; 3411 + +GetNthString:: ; 3411 +; Return the address of the +; ath string starting from hl. + + and a + ret z + + push bc + ld b, a + ld c, "@" +.readChar + ld a, [hli] + cp c + jr nz, .readChar + dec b + jr nz, .readChar + pop bc + ret +; 3420 + +GetBasePokemonName:: ; 3420 +; Discards gender (Nidoran). + + push hl + call GetPokemonName + + ld hl, StringBuffer1 +.loop + ld a, [hl] + cp "@" + jr z, .quit + cp "♂" + jr z, .end + cp "♀" + jr z, .end + inc hl + jr .loop +.end + ld [hl], "@" +.quit + pop hl + ret + +; 343b + +GetPokemonName:: ; 343b +; Get Pokemon name wd265. + + ld a, [hROMBank] + push af + push hl + ld a, BANK(PokemonNames) + rst Bankswitch + +; Each name is ten characters + ld a, [wd265] + dec a + ld d, 0 + ld e, a + ld h, 0 + ld l, a + add hl, hl ; hl = hl * 4 + add hl, hl ; hl = hl * 4 + add hl, de ; hl = (hl*4) + de + add hl, hl ; hl = (5*hl) + (5*hl) + ld de, PokemonNames + add hl, de + +; Terminator + ld de, StringBuffer1 + push de + ld bc, PKMN_NAME_LENGTH - 1 + call CopyBytes + ld hl, StringBuffer1 + PKMN_NAME_LENGTH - 1 + ld [hl], "@" + pop de + + pop hl + pop af + rst Bankswitch + ret +; 3468 + +GetItemName:: ; 3468 +; Get item name wd265. + + push hl + push bc + ld a, [wd265] + + cp TM01 + jr nc, .TM + + ld [CurSpecies], a + ld a, ITEM_NAME + ld [wNamedObjectTypeBuffer], a + call GetName + jr .Copied +.TM: + call GetTMHMName +.Copied: + ld de, StringBuffer1 + pop bc + pop hl + ret +; 3487 + +GetTMHMName:: ; 3487 +; Get TM/HM name by item id wd265. + + push hl + push de + push bc + ld a, [wd265] + push af + +; TM/HM prefix + cp HM01 + push af + jr c, .TM + + ld hl, .HMText + ld bc, .HMTextEnd - .HMText + jr .asm_34a1 + +.TM: + ld hl, .TMText + ld bc, .TMTextEnd - .TMText + +.asm_34a1 + ld de, StringBuffer1 + call CopyBytes + +; TM/HM number + push de + ld a, [wd265] + ld c, a + callab GetTMHMNumber + pop de + +; HM numbers start from 51, not 1 + pop af + ld a, c + jr c, .asm_34b9 + sub NUM_TMS +.asm_34b9 + +; Divide and mod by 10 to get the top and bottom digits respectively + ld b, "0" +.mod10 + sub 10 + jr c, .asm_34c2 + inc b + jr .mod10 +.asm_34c2 + add 10 + + push af + ld a, b + ld [de], a + inc de + pop af + + ld b, "0" + add b + ld [de], a + +; End the string + inc de + ld a, "@" + ld [de], a + + pop af + ld [wd265], a + pop bc + pop de + pop hl + ret + +.TMText: + db "TM" +.TMTextEnd: + db "@" + +.HMText: + db "HM" +.HMTextEnd: + db "@" +; 34df + +INCLUDE "home/hm_moves.asm" + +GetMoveName:: ; 34f8 + push hl + + ld a, MOVE_NAME + ld [wNamedObjectTypeBuffer], a + + ld a, [wNamedObjectIndexBuffer] ; move id + ld [CurSpecies], a + + call GetName + ld de, StringBuffer1 + + pop hl + ret +; 350c diff --git a/home/text.asm b/home/text.asm index a70424048..3401eba50 100644 --- a/home/text.asm +++ b/home/text.asm @@ -8,9 +8,6 @@ TEXTBOX_INNERX EQU TEXTBOX_X + 1 TEXTBOX_Y EQU SCREEN_HEIGHT - TEXTBOX_HEIGHT TEXTBOX_INNERY EQU TEXTBOX_Y + 2 -TEXTBOX_PAL EQU 7 - - ClearBox:: ; fb6 ; Fill a c*b box at hl with blank tiles. @@ -51,7 +48,7 @@ ClearTileMap:: ; fc8 ClearScreen:: ; fdb - ld a, TEXTBOX_PAL + ld a, PAL_BG_TEXT hlcoord 0, 0, AttrMap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill @@ -133,7 +130,7 @@ TextBoxPalette:: ; 1024 inc b inc c inc c - ld a, TEXTBOX_PAL + ld a, PAL_BG_TEXT .col push bc push hl @@ -230,42 +227,42 @@ dict2: macro ._\@: endm - dict "", Char15 - dict "", LineChar - dict "", NextLineChar - dict TX_FAR, TextFar - dict $00, NullChar - dict $4c, Char4C - dict $4b, Char4B - dict "", Paragraph - dict "", PrintMomsName - dict "", PrintPlayerName - dict "", PrintRivalName - dict $35, Char35 - dict $36, Char36 - dict $37, Char37 - dict "", PrintRedsName - dict "", PrintGreensName - dict "#", PlacePOKe - dict "", PCChar - dict "", RocketChar - dict "", TMChar - dict "", TrainerChar - dict $23, PlaceKougeki - dict "", Char22 - dict "", ContText - dict "<......>", SixDotsChar - dict "", DoneText - dict "", PromptText - dict "", PlacePKMN - dict "", PlacePOKE - dict $25, NextChar - dict2 $1f, " " - dict "", PlaceDexEnd - dict "", PlaceMoveTargetsName - dict "", PlaceMoveUsersName - dict "", PlaceEnemysName - dict "", PlaceGenderedPlayerName + dict "", Char15 + dict "", LineChar + dict "", NextLineChar + dict TX_FAR, TextFar + dict $00, NullChar + dict $4c, Char4C + dict $4b, Char4B + dict "", Paragraph + dict "", PrintMomsName + dict "", PrintPlayerName + dict "", PrintRivalName + dict $35, Char35 + dict $36, Char36 + dict $37, Char37 + dict "", PrintRedsName + dict "", PrintGreensName + dict "#", PlacePOKe + dict "", PCChar + dict "", RocketChar + dict "", TMChar + dict "", TrainerChar + dict "", PlaceKougeki + dict "", Char22 + dict "", ContText + dict "<......>", SixDotsChar + dict "", DoneText + dict "", PromptText + dict "", PlacePKMN + dict "", PlacePOKE + dict "%", NextChar + dict2 "¯", " " + dict "", PlaceDexEnd + dict "", PlaceMoveTargetsName + dict "", PlaceMoveUsersName + dict "", PlaceEnemysName + dict "", PlaceGenderedPlayerName cp "ﾟ" jr z, .place ; should be .diacritic diff --git a/home/time.asm b/home/time.asm index 338168752..abdd34fe2 100644 --- a/home/time.asm +++ b/home/time.asm @@ -49,19 +49,16 @@ GetClock:: ; 5b7 ld [hl], RTC_S ld a, [de] maskbits 60 - and x ld [hRTCSeconds], a ld [hl], RTC_M ld a, [de] maskbits 60 - and x ld [hRTCMinutes], a ld [hl], RTC_H ld a, [de] maskbits 24 - and x ld [hRTCHours], a ld [hl], RTC_DL diff --git a/home/trainers.asm b/home/trainers.asm new file mode 100644 index 000000000..857a95629 --- /dev/null +++ b/home/trainers.asm @@ -0,0 +1,263 @@ +CheckTrainerBattle2:: ; 3600 + ld a, [hROMBank] + push af + + call SwitchToMapScriptHeaderBank + call CheckTrainerBattle + + pop bc + ld a, b + rst Bankswitch + ret +; 360d + +CheckTrainerBattle:: ; 360d +; Check if any trainer on the map sees the player and wants to battle. + +; Skip the player object. + ld a, 1 + ld de, MapObjects + OBJECT_LENGTH + +.loop + +; Start a battle if the object: + + push af + push de + +; Has a sprite + ld hl, MAPOBJECT_SPRITE + add hl, de + ld a, [hl] + and a + jr z, .next + +; Is a trainer + ld hl, MAPOBJECT_COLOR + add hl, de + ld a, [hl] + and $f + cp $2 + jr nz, .next + +; Is visible on the map + ld hl, MAPOBJECT_OBJECT_STRUCT_ID + add hl, de + ld a, [hl] + cp -1 + jr z, .next + +; Is facing the player... + call GetObjectStruct + call FacingPlayerDistance_bc + jr nc, .next + +; ...within their sight range + ld hl, MAPOBJECT_RANGE + add hl, de + ld a, [hl] + cp b + jr c, .next + +; And hasn't already been beaten + push bc + push de + ld hl, MAPOBJECT_SCRIPT_POINTER + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + ld e, [hl] + inc hl + ld d, [hl] + ld b, CHECK_FLAG + call EventFlagAction + ld a, c + pop de + pop bc + and a + jr z, .startbattle + +.next + pop de + ld hl, OBJECT_LENGTH + add hl, de + ld d, h + ld e, l + + pop af + inc a + cp NUM_OBJECTS + jr nz, .loop + xor a + ret + +.startbattle + pop de + pop af + ld [hLastTalked], a + ld a, b + ld [EngineBuffer2], a + ld a, c + ld [EngineBuffer3], a + jr LoadTrainer_continue +; 3674 + +TalkToTrainer:: ; 3674 + ld a, 1 + ld [EngineBuffer2], a + ld a, -1 + ld [EngineBuffer3], a + +LoadTrainer_continue:: ; 367e + call GetMapScriptHeaderBank + ld [EngineBuffer1], a + + ld a, [hLastTalked] + call GetMapObject + + ld hl, MAPOBJECT_SCRIPT_POINTER + add hl, bc + ld a, [EngineBuffer1] + call GetFarHalfword + ld de, wTempTrainerHeader + ld bc, wTempTrainerHeaderEnd - wTempTrainerHeader + ld a, [EngineBuffer1] + call FarCopyBytes + xor a + ld [wRunningTrainerBattleScript], a + scf + ret +; 36a5 + +FacingPlayerDistance_bc:: ; 36a5 + + push de + call FacingPlayerDistance + ld b, d + ld c, e + pop de + ret +; 36ad + +FacingPlayerDistance:: ; 36ad +; Return carry if the sprite at bc is facing the player, +; and its distance in d. + + ld hl, OBJECT_NEXT_MAP_X ; x + add hl, bc + ld d, [hl] + + ld hl, OBJECT_NEXT_MAP_Y ; y + add hl, bc + ld e, [hl] + + ld a, [PlayerStandingMapX] + cp d + jr z, .CheckY + + ld a, [PlayerStandingMapY] + cp e + jr z, .CheckX + + and a + ret + +.CheckY: + ld a, [PlayerStandingMapY] + sub e + jr z, .NotFacing + jr nc, .Above + +; Below + cpl + inc a + ld d, a + ld e, OW_UP + jr .CheckFacing + +.Above: + ld d, a + ld e, OW_DOWN + jr .CheckFacing + +.CheckX: + ld a, [PlayerStandingMapX] + sub d + jr z, .NotFacing + jr nc, .Left + +; Right + cpl + inc a + ld d, a + ld e, OW_LEFT + jr .CheckFacing + +.Left: + ld d, a + ld e, OW_RIGHT + +.CheckFacing: + call GetSpriteDirection + cp e + jr nz, .NotFacing + scf + ret + +.NotFacing: + and a + ret +; 36f5 + +CheckTrainerFlag:: ; 36f5 + push bc + ld hl, OBJECT_MAP_OBJECT_INDEX + add hl, bc + ld a, [hl] + call GetMapObject + ld hl, MAPOBJECT_SCRIPT_POINTER + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + call GetMapScriptHeaderBank + call GetFarHalfword + ld d, h + ld e, l + push de + ld b, CHECK_FLAG + call EventFlagAction + pop de + ld a, c + and a + pop bc + ret +; 3718 + +PrintWinLossText:: ; 3718 + ld a, [BattleType] + cp BATTLETYPE_CANLOSE + jr .canlose ; ?????????? + +; unreferenced + ld hl, wWinTextPointer + jr .ok + +.canlose + ld a, [wBattleResult] + ld hl, wWinTextPointer + and $f + jr z, .ok + ld hl, wLossTextPointer + +.ok + ld a, [hli] + ld h, [hl] + ld l, a + call GetMapScriptHeaderBank + call FarPrintText + call WaitBGMap + call WaitPressAorB_BlinkCursor + ret +; 3741 diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm index a122d2472..0d2003f2e 100644 --- a/lib/mobile/main.asm +++ b/lib/mobile/main.asm @@ -2,7 +2,7 @@ charmap "", $d -INCLUDE "gbhw.asm" +INCLUDE "constants/hardware_constants.asm" SECTION "Main", ROMX diff --git a/macros.asm b/macros.asm index 9b7bdf78c..48c2ceca4 100644 --- a/macros.asm +++ b/macros.asm @@ -1,320 +1,26 @@ INCLUDE "macros/enum.asm" -INCLUDE "macros/basestats.asm" -INCLUDE "macros/event.asm" -INCLUDE "macros/sound.asm" -INCLUDE "macros/text.asm" INCLUDE "macros/charmap.asm" -INCLUDE "macros/move_anim.asm" -INCLUDE "macros/movement.asm" -INCLUDE "macros/map.asm" -INCLUDE "macros/pic.asm" INCLUDE "macros/predef.asm" INCLUDE "macros/rst.asm" -INCLUDE "macros/mobile.asm" -INCLUDE "macros/trainer.asm" -INCLUDE "macros/trade_anim.asm" +INCLUDE "macros/data.asm" +INCLUDE "macros/code.asm" +INCLUDE "macros/coords.asm" +INCLUDE "macros/color.asm" +INCLUDE "macros/base_stats.asm" INCLUDE "macros/tilesets.asm" -RGB: MACRO -rept _NARG / 3 - dw ((\3) << 10) + ((\2) << 5) + (\1) - shift - shift - shift -endr - ENDM +INCLUDE "macros/scripts/audio.asm" +INCLUDE "macros/scripts/maps.asm" +INCLUDE "macros/scripts/event.asm" +INCLUDE "macros/scripts/text.asm" +INCLUDE "macros/scripts/movement.asm" +INCLUDE "macros/scripts/effect_commands.asm" +INCLUDE "macros/scripts/move_anim.asm" +INCLUDE "macros/scripts/trade_anim.asm" +INCLUDE "macros/scripts/gfx_anim.asm" percent EQUS "* $ff / 100" - -dwb: MACRO - dw \1 - db \2 - ENDM - -dbw: MACRO - db \1 - dw \2 - ENDM - -dbbw: MACRO - db \1, \2 - dw \3 - ENDM - -dbww: MACRO - db \1 - dw \2, \3 - ENDM - -dbwww: MACRO - db \1 - dw \2, \3, \4 - ENDM - -dn: MACRO - rept _NARG / 2 - db (\1) << 4 + (\2) - shift - shift - endr - ENDM - -dx: MACRO -x = 8 * ((\1) - 1) - rept \1 - db ((\2) >> x) & $ff -x = x + -8 - endr - ENDM - -dt: MACRO ; three-byte (big-endian) - dx 3, \1 - ENDM - -dd: MACRO ; four-byte (big-endian) - dx 4, \1 - ENDM - -bigdw: MACRO ; big-endian word - dx 2, \1 - ENDM - -dba: MACRO ; dbw bank, address - rept _NARG - dbw BANK(\1), \1 - shift - endr - ENDM - -dab: MACRO ; dwb address, bank - rept _NARG - dwb \1, BANK(\1) - shift - endr - ENDM - -lb: MACRO ; r, hi, lo - ld \1, (\2 & $ff) << 8 + (\3 & $ff) - ENDM - -ln: MACRO ; r, hi, lo - ld \1, (\2 & $f) << 4 + (\3 & $f) - ENDM - -bccoord equs "coord bc," -decoord equs "coord de," -hlcoord equs "coord hl," - -coord: MACRO -; register, x, y[, origin] - if _NARG < 4 - ld \1, TileMap + SCREEN_WIDTH * (\3) + (\2) - else - ld \1, \4 + SCREEN_WIDTH * (\3) + (\2) - endc - ENDM - -dwcoord: MACRO - rept _NARG / 2 - dw TileMap + SCREEN_WIDTH * (\2) + (\1) - shift - shift - endr - ENDM - -ldcoord_a: MACRO - if _NARG < 3 - ld [TileMap + SCREEN_WIDTH * (\2) + (\1)], a - else - ld [\3 + SCREEN_WIDTH * (\2) + (\1)], a - endc - ENDM - -lda_coord: MACRO - if _NARG < 3 - ld a, [TileMap + SCREEN_WIDTH * (\2) + (\1)] - else - ld a, [\3 + SCREEN_WIDTH * (\2) + (\1)] - endc - ENDM - -; pic animations -frame: MACRO - db \1 -x = \2 -IF _NARG > 2 -rept _NARG +- 2 -x = x | (1 << (\3 + 1)) - shift -endr -endc - db x - ENDM -setrepeat: MACRO - db $fe - db \1 - ENDM -dorepeat: MACRO - db $fd - db \1 - ENDM -endanim: MACRO - db $ff - ENDM - - -delanim: MACRO - db $fc - ENDM -dorestart: MACRO - db $fe - ENDM - -sine_wave: MACRO -; \1: amplitude - -x = 0 - rept $20 - ; Round up. - dw (sin(x) + (sin(x) & $ff)) >> 8 -x = x + (\1) * $40000 - endr -ENDM - - -bcd: MACRO - rept _NARG - dn ((\1) % 100) / 10, (\1) % 10 - shift - endr -ENDM - -tiles EQUS "* $10" -tile EQUS "+ $10 *" - -partymon: MACRO - db \1 - db \2 - db \3, \4, \5, \6 - dw \7 - dt \8 -rept 8 - shift -endr -rept 5 - bigdw \1 - shift -endr - db \1, \2 - db \3, \4, \5, \6 -rept 6 - shift -endr - db \1 - db \2, \3, \4 - db \5 - db \6, \7 -rept 7 - shift -endr -rept 7 - bigdw \1 - shift -endr - db \1 -ENDM - -palettes EQUS "* 8" -palette EQUS "+ 8 *" - -ldpixel: MACRO -if _NARG >= 5 - lb \1, \2 * 8 + \4, \3 * 8 + \5 -else - lb \1, \2 * 8, \3 * 8 -endc -endm - -depixel EQUS "ldpixel de," -bcpixel EQUS "ldpixel bc," - -dbpixel: MACRO -if _NARG >= 4 - db \1 * 8 + \3, \2 * 8 + \4 -else - db \1 * 8, \2 * 8 -endc -endm - -bgcoord: MACRO -IF _NARG >= 4 - ld \1, \3 * $20 + \2 + \4 -ELSE - ld \1, \3 * $20 + \2 + VBGMap0 -ENDC -ENDM - -hlbgcoord EQUS "bgcoord hl," -debgcoord EQUS "bgcoord de," -bcbgcoord EQUS "bgcoord bc," -bgrows EQUS "* $20" - -palred EQUS "$0001 *" -palgreen EQUS "$0020 *" -palblue EQUS "$0400 *" - -dsprite: MACRO -; conditional segment is there because not every instance of -; this macro is directly OAM -if _NARG >= 7 ; y tile, y pxl, x tile, x pxl, vtile offset, flags, palette - db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, (\6 << 3) + (\7 & 7) -else - db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, \6 -endc -endm - -jumptable: MACRO - ld a, [\2] - ld e, a - ld d, 0 - ld hl, \1 - add hl, de - add hl, de - ld a, [hli] - ld h, [hl] - ld l, a - jp hl -endm - -maskbits: macro -; returns to x -; usage in rejection sampling -; .loop -; call Random -; maskbits 30 -; and x -; cp 30 -; jr nc, .loop - -x = 1 -rept 8 -IF \1 > x -x = (x + 1) * 2 +- 1 -ENDC -endr -endm - -homecall: MACRO - ld a, [hROMBank] - push af - ld a, BANK(\1) - rst Bankswitch - - call \1 - - pop af - rst Bankswitch -ENDM - +tiles EQUS "* LEN_2BPP_TILE" +tile EQUS "+ LEN_2BPP_TILE *" diff --git a/macros/basestats.asm b/macros/base_stats.asm similarity index 95% rename from macros/basestats.asm rename to macros/base_stats.asm index f3e98b64a..f7c841634 100644 --- a/macros/basestats.asm +++ b/macros/base_stats.asm @@ -1,3 +1,5 @@ +; Used in data/pokemon/base_stats/*.asm + define: macro if !def(\1) \1 equs \2 diff --git a/macros/charmap.asm b/macros/charmap.asm index b936b0953..fd2d371fd 100644 --- a/macros/charmap.asm +++ b/macros/charmap.asm @@ -1,208 +1,209 @@ ; Control characters - charmap "", $00 - charmap "", $14 ; gendered PlayerName; same as "" in English - charmap "", $15 - charmap "¯", $1f ; soft linebreak - charmap "", $22 - charmap "", $24 ; "" - charmap "%", $25 - charmap "", $38 ; RedsName - charmap "", $39 ; GreensName - charmap "", $3f - charmap "", $49 ; MomsName - charmap "", $4a ; "" - charmap "", $4e - charmap "", $4f + charmap "", $00 + charmap "", $14 ; gendered PlayerName; same as "" in English + charmap "", $15 + charmap "¯", $1f ; soft linebreak + charmap "", $22 + charmap "", $23 ; "こうげき" + charmap "", $24 ; "" + charmap "%", $25 + charmap "", $38 ; RedsName + charmap "", $39 ; GreensName + charmap "", $3f + charmap "", $49 ; MomsName + charmap "", $4a ; "" + charmap "", $4e + charmap "", $4f - charmap "@", $50 - charmap "", $51 - charmap "", $52 ; PlayerName - charmap "", $53 - charmap "#", $54 - charmap "", $55 - charmap "<......>", $56 ; "……" - charmap "", $57 - charmap "", $58 - charmap "", $59 - charmap "", $5a - charmap "", $5b ; "PC" - charmap "", $5c ; "TM" - charmap "", $5d ; "TRAINER" - charmap "", $5e ; "ROCKET" - charmap "", $5f + charmap "@", $50 ; string terminator + charmap "", $51 + charmap "", $52 ; PlayerName + charmap "", $53 + charmap "#", $54 ; "POKé" + charmap "", $55 + charmap "<......>", $56 ; "……" + charmap "", $57 + charmap "", $58 + charmap "", $59 + charmap "", $5a + charmap "", $5b ; "PC" + charmap "", $5c ; "TM" + charmap "", $5d ; "TRAINER" + charmap "", $5e ; "ROCKET" + charmap "", $5f -; Actual characters (from gfx/misc/font_extra.png) +; Actual characters (from gfx/font/font_extra.png) - charmap "", $60 ; unused - charmap "", $61 ; unused - charmap "", $62 ; unused - charmap "", $63 ; unused - charmap "", $64 ; unused - charmap "", $65 ; unused - charmap "", $66 ; unused - charmap "", $67 ; unused - charmap "", $68 ; unused - charmap "", $69 - charmap "", $6a - charmap "", $6b ; unused - charmap "", $6c ; unused - charmap "", $6d ; colon with tinier dots than ":" - charmap "ぃ", $6e ; hiragana small i, unused - charmap "ぅ", $6f ; hiragana small u, unused - charmap "", $70 - charmap "", $71 - charmap "<``>", $72 ; opening quote - charmap "<''>", $73 ; closing quote - charmap "·", $74 ; middle dot, unused - charmap "…", $75 ; ellipsis - charmap "ぁ", $76 ; hiragana small a, unused - charmap "ぇ", $77 ; hiragana small e, unused - charmap "ぉ", $78 ; hiragana small o, unused + charmap "", $60 ; unused + charmap "", $61 ; unused + charmap "", $62 ; unused + charmap "", $63 ; unused + charmap "", $64 ; unused + charmap "", $65 ; unused + charmap "", $66 ; unused + charmap "", $67 ; unused + charmap "", $68 ; unused + charmap "", $69 + charmap "", $6a + charmap "", $6b ; unused + charmap "", $6c ; unused + charmap "", $6d ; colon with tinier dots than ":" + charmap "ぃ", $6e ; hiragana small i, unused + charmap "ぅ", $6f ; hiragana small u, unused + charmap "", $70 + charmap "", $71 + charmap "<``>", $72 ; opening quote + charmap "<''>", $73 ; closing quote + charmap "·", $74 ; middle dot, unused + charmap "…", $75 ; ellipsis + charmap "ぁ", $76 ; hiragana small a, unused + charmap "ぇ", $77 ; hiragana small e, unused + charmap "ぉ", $78 ; hiragana small o, unused - charmap "┌", $79 - charmap "─", $7a - charmap "┐", $7b - charmap "│", $7c - charmap "└", $7d - charmap "┘", $7e - charmap " ", $7f + charmap "┌", $79 + charmap "─", $7a + charmap "┐", $7b + charmap "│", $7c + charmap "└", $7d + charmap "┘", $7e + charmap " ", $7f -; Actual characters (from gfx/misc/font_battle_extra.png) +; Actual characters (from gfx/font/font_battle_extra.png) - charmap "", $6e + charmap "", $6e - charmap "<ど>", $70 ; hiragana small do, unused - charmap "◀", $71 - charmap "『", $72 ; Japanese opening quote, unused - charmap "", $73 - charmap "№", $74 + charmap "<ど>", $70 ; hiragana small do, unused + charmap "◀", $71 + charmap "『", $72 ; Japanese opening quote, unused + charmap "", $73 + charmap "№", $74 ; Actual characters (from other graphics files) - charmap "|", $31 ; from gfx/stats/stats_tiles + charmap "|", $31 ; from gfx/stats/stats_tiles - charmap "", $3f ; gfx/stats/shiny + charmap "", $3f ; gfx/stats/shiny - charmap "", $60 ; from gfx/mobile/phone_tiles.2bpp - charmap "▲", $61 ; gfx/font/up_arrow.png - charmap "", $62 ; gfx/mobile/overworld_phone_icon.2bpp - charmap "_", $62 ; from gfx/battle/hp_exp_bar_border.1bpp + charmap "", $60 ; from gfx/mobile/phone_tiles.2bpp + charmap "▲", $61 ; gfx/font/up_arrow.png + charmap "", $62 ; gfx/font/overworld_phone_icon.2bpp + charmap "_", $62 ; from gfx/battle/hp_exp_bar_border.1bpp - charmap "′", $6e ; gfx/font/feet_inches.png - charmap "″", $6f ; gfx/font/feet_inches.png + charmap "′", $6e ; gfx/font/feet_inches.png + charmap "″", $6f ; gfx/font/feet_inches.png -; Actual characters (from gfx/misc/font.png) +; Actual characters (from gfx/font/font.png) - charmap "A", $80 - charmap "B", $81 - charmap "C", $82 - charmap "D", $83 - charmap "E", $84 - charmap "F", $85 - charmap "G", $86 - charmap "H", $87 - charmap "I", $88 - charmap "J", $89 - charmap "K", $8a - charmap "L", $8b - charmap "M", $8c - charmap "N", $8d - charmap "O", $8e - charmap "P", $8f - charmap "Q", $90 - charmap "R", $91 - charmap "S", $92 - charmap "T", $93 - charmap "U", $94 - charmap "V", $95 - charmap "W", $96 - charmap "X", $97 - charmap "Y", $98 - charmap "Z", $99 + charmap "A", $80 + charmap "B", $81 + charmap "C", $82 + charmap "D", $83 + charmap "E", $84 + charmap "F", $85 + charmap "G", $86 + charmap "H", $87 + charmap "I", $88 + charmap "J", $89 + charmap "K", $8a + charmap "L", $8b + charmap "M", $8c + charmap "N", $8d + charmap "O", $8e + charmap "P", $8f + charmap "Q", $90 + charmap "R", $91 + charmap "S", $92 + charmap "T", $93 + charmap "U", $94 + charmap "V", $95 + charmap "W", $96 + charmap "X", $97 + charmap "Y", $98 + charmap "Z", $99 - charmap "(", $9a - charmap ")", $9b - charmap ":", $9c - charmap ";", $9d - charmap "[", $9e - charmap "]", $9f + charmap "(", $9a + charmap ")", $9b + charmap ":", $9c + charmap ";", $9d + charmap "[", $9e + charmap "]", $9f - charmap "a", $a0 - charmap "b", $a1 - charmap "c", $a2 - charmap "d", $a3 - charmap "e", $a4 - charmap "f", $a5 - charmap "g", $a6 - charmap "h", $a7 - charmap "i", $a8 - charmap "j", $a9 - charmap "k", $aa - charmap "l", $ab - charmap "m", $ac - charmap "n", $ad - charmap "o", $ae - charmap "p", $af - charmap "q", $b0 - charmap "r", $b1 - charmap "s", $b2 - charmap "t", $b3 - charmap "u", $b4 - charmap "v", $b5 - charmap "w", $b6 - charmap "x", $b7 - charmap "y", $b8 - charmap "z", $b9 + charmap "a", $a0 + charmap "b", $a1 + charmap "c", $a2 + charmap "d", $a3 + charmap "e", $a4 + charmap "f", $a5 + charmap "g", $a6 + charmap "h", $a7 + charmap "i", $a8 + charmap "j", $a9 + charmap "k", $aa + charmap "l", $ab + charmap "m", $ac + charmap "n", $ad + charmap "o", $ae + charmap "p", $af + charmap "q", $b0 + charmap "r", $b1 + charmap "s", $b2 + charmap "t", $b3 + charmap "u", $b4 + charmap "v", $b5 + charmap "w", $b6 + charmap "x", $b7 + charmap "y", $b8 + charmap "z", $b9 - charmap "Ä", $c0 - charmap "Ö", $c1 - charmap "Ü", $c2 - charmap "ä", $c3 - charmap "ö", $c4 - charmap "ü", $c5 + charmap "Ä", $c0 + charmap "Ö", $c1 + charmap "Ü", $c2 + charmap "ä", $c3 + charmap "ö", $c4 + charmap "ü", $c5 - charmap "'d", $d0 - charmap "'l", $d1 - charmap "'m", $d2 - charmap "'r", $d3 - charmap "'s", $d4 - charmap "'t", $d5 - charmap "'v", $d6 + charmap "'d", $d0 + charmap "'l", $d1 + charmap "'m", $d2 + charmap "'r", $d3 + charmap "'s", $d4 + charmap "'t", $d5 + charmap "'v", $d6 - charmap "←", $df - charmap "'", $e0 - charmap "", $e1 - charmap "", $e2 - charmap "-", $e3 + charmap "←", $df + charmap "'", $e0 + charmap "", $e1 + charmap "", $e2 + charmap "-", $e3 - charmap "?", $e6 - charmap "!", $e7 - charmap ".", $e8 - charmap "&", $e9 + charmap "?", $e6 + charmap "!", $e7 + charmap ".", $e8 + charmap "&", $e9 - charmap "é", $ea - charmap "→", $eb - charmap "▷", $ec - charmap "▶", $ed - charmap "▼", $ee - charmap "♂", $ef - charmap "¥", $f0 - charmap "×", $f1 - charmap "", $f2 ; same as "." in English - charmap "/", $f3 - charmap ",", $f4 - charmap "♀", $f5 + charmap "é", $ea + charmap "→", $eb + charmap "▷", $ec + charmap "▶", $ed + charmap "▼", $ee + charmap "♂", $ef + charmap "¥", $f0 + charmap "×", $f1 + charmap "", $f2 ; same as "." in English + charmap "/", $f3 + charmap ",", $f4 + charmap "♀", $f5 - charmap "0", $f6 - charmap "1", $f7 - charmap "2", $f8 - charmap "3", $f9 - charmap "4", $fa - charmap "5", $fb - charmap "6", $fc - charmap "7", $fd - charmap "8", $fe - charmap "9", $ff + charmap "0", $f6 + charmap "1", $f7 + charmap "2", $f8 + charmap "3", $f9 + charmap "4", $fa + charmap "5", $fb + charmap "6", $fc + charmap "7", $fd + charmap "8", $fe + charmap "9", $ff ; Japanese kana, for those bits of text that were not translated to English diff --git a/macros/code.asm b/macros/code.asm new file mode 100644 index 000000000..5e247e9a3 --- /dev/null +++ b/macros/code.asm @@ -0,0 +1,55 @@ +; Syntactic sugar macros + +lb: MACRO ; r, hi, lo + ld \1, (\2 & $ff) << 8 + (\3 & $ff) + ENDM + +ln: MACRO ; r, hi, lo + ld \1, (\2 & $f) << 4 + (\3 & $f) + ENDM + +ldpixel: MACRO +if _NARG >= 5 + lb \1, \2 * 8 + \4, \3 * 8 + \5 +else + lb \1, \2 * 8, \3 * 8 +endc +endm + +depixel EQUS "ldpixel de," +bcpixel EQUS "ldpixel bc," + + +; Design patterns + +jumptable: MACRO + ld a, [\2] + ld e, a + ld d, 0 + ld hl, \1 + add hl, de + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + jp hl +endm + +; Many mobile functions were dummied out in localization. +mobile EQUS "ret" + +maskbits: macro +; example usage in rejection sampling: +; .loop +; call Random +; maskbits 30 +; cp 30 +; jr nc, .loop +x = 1 +rept 8 +IF \1 > x +x = (x + 1) * 2 +- 1 +ENDC +endr + and x +endm diff --git a/macros/color.asm b/macros/color.asm new file mode 100644 index 000000000..35d69fe6f --- /dev/null +++ b/macros/color.asm @@ -0,0 +1,15 @@ +RGB: MACRO +rept _NARG / 3 + dw ((\3) << 10) + ((\2) << 5) + (\1) + shift + shift + shift +endr +ENDM + +palettes EQUS "* 8" +palette EQUS "+ 8 *" + +palred EQUS "$0001 *" +palgreen EQUS "$0020 *" +palblue EQUS "$0400 *" diff --git a/macros/coords.asm b/macros/coords.asm new file mode 100644 index 000000000..2a672c3d0 --- /dev/null +++ b/macros/coords.asm @@ -0,0 +1,51 @@ +bccoord equs "coord bc," +decoord equs "coord de," +hlcoord equs "coord hl," + +coord: MACRO +; register, x, y[, origin] + if _NARG < 4 + ld \1, TileMap + SCREEN_WIDTH * (\3) + (\2) + else + ld \1, \4 + SCREEN_WIDTH * (\3) + (\2) + endc + ENDM + +dwcoord: MACRO + rept _NARG / 2 + dw TileMap + SCREEN_WIDTH * (\2) + (\1) + shift + shift + endr + ENDM + +ldcoord_a: MACRO + if _NARG < 3 + ld [TileMap + SCREEN_WIDTH * (\2) + (\1)], a + else + ld [\3 + SCREEN_WIDTH * (\2) + (\1)], a + endc + ENDM + +lda_coord: MACRO + if _NARG < 3 + ld a, [TileMap + SCREEN_WIDTH * (\2) + (\1)] + else + ld a, [\3 + SCREEN_WIDTH * (\2) + (\1)] + endc + ENDM + + +bgrows EQUS "* $20" ; SCREEN_WIDTH + +hlbgcoord EQUS "bgcoord hl," +debgcoord EQUS "bgcoord de," +bcbgcoord EQUS "bgcoord bc," + +bgcoord: MACRO +IF _NARG >= 4 + ld \1, \3 bgrows + \2 + \4 +ELSE + ld \1, \3 bgrows + \2 + VBGMap0 +ENDC +ENDM diff --git a/macros/data.asm b/macros/data.asm new file mode 100644 index 000000000..cf4af0338 --- /dev/null +++ b/macros/data.asm @@ -0,0 +1,121 @@ +; Constant data (db, dw, dl) macros + +dwb: MACRO + dw \1 + db \2 + ENDM + +dbw: MACRO + db \1 + dw \2 + ENDM + +dbbw: MACRO + db \1, \2 + dw \3 + ENDM + +dbww: MACRO + db \1 + dw \2, \3 + ENDM + +dbwww: MACRO + db \1 + dw \2, \3, \4 + ENDM + +dn: MACRO ; nybbles + rept _NARG / 2 + db ((\1) << 4) | (\2) + shift + shift + endr + ENDM + +dc: MACRO ; "crumbs" + rept _NARG / 4 + db ((\1) << 6) | ((\2) << 4) | ((\3) << 2) | (\4) + shift + shift + shift + shift + endr + ENDM + +dx: MACRO +x = 8 * ((\1) - 1) + rept \1 + db ((\2) >> x) & $ff +x = x + -8 + endr + ENDM + +dt: MACRO ; three-byte (big-endian) + dx 3, \1 + ENDM + +dd: MACRO ; four-byte (big-endian) + dx 4, \1 + ENDM + +bigdw: MACRO ; big-endian word + dx 2, \1 + ENDM + +dba: MACRO ; dbw bank, address + rept _NARG + dbw BANK(\1), \1 + shift + endr + ENDM + +dab: MACRO ; dwb address, bank + rept _NARG + dwb \1, BANK(\1) + shift + endr + ENDM + +dba_pic: MACRO ; dbw bank, address + db BANK(\1) - PICS_FIX + dw \1 +ENDM + + +dbpixel: MACRO +if _NARG >= 4 + db \1 * 8 + \3, \2 * 8 + \4 +else + db \1 * 8, \2 * 8 +endc +endm + +dsprite: MACRO +; conditional segment is there because not every instance of +; this macro is directly OAM +if _NARG >= 7 ; y tile, y pxl, x tile, x pxl, vtile offset, flags, palette + db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, (\6 << 3) + (\7 & 7) +else + db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, \6 +endc +endm + + +sine_wave: MACRO +; \1: amplitude +x = 0 + rept $20 + ; Round up. + dw (sin(x) + (sin(x) & $ff)) >> 8 +x = x + (\1) * $40000 + endr +ENDM + + +bcd: MACRO + rept _NARG + dn ((\1) % 100) / 10, (\1) % 10 + shift + endr +ENDM diff --git a/macros/map.asm b/macros/map.asm deleted file mode 100644 index f153806da..000000000 --- a/macros/map.asm +++ /dev/null @@ -1,211 +0,0 @@ -map: macro -;\1: map id - db GROUP_\1, MAP_\1 -endm - -maptrigger: macro -;\1: script pointer - dw \1, 0 -endm - -warp_def: macro -;\1: y: top to bottom, starts at 0 -;\2: x: left to right, starts at 0 -;\3: warp destination: starts at 1 -;\4: map id: from constants/map_constants.asm - db \1, \2, \3 - map \4 -endm - -xy_trigger: macro -;\1: number: controlled by dotrigger/domaptrigger -;\2: y: top to bottom, starts at 0 -;\3: x: left to right, starts at 0 -;\4: script pointer - db \1, \2, \3, $0 - dw \4 - db $0, $0 -endm - -signpost: macro -;\1: y: top to bottom, starts at 0 -;\2: x: left to right, starts at 0 -;\3: function: a SIGNPOST_* constant -;\4: script pointer - db \1, \2, \3 - dw \4 -endm - -person_event: macro -;\1: sprite: a SPRITE_* constant -;\2: y: top to bottom, starts at 0 -;\3: x: left to right, starts at 0 -;\4: movement function: a SPRITEMOVEDATA_* constant -;\5, \6: movement radius: y, x -;\7: clock hour: ??? -;\8: clock daytime: sum of MORN, DAY, and/or NITE, or 0 for always -;\9: color: a PAL_NPC_* constant, or 0 for sprite default -;\10: function: a PERSONTYPE_* constant -;\11: sight range: applies to PERSONTYPE_TRAINER -;\12: script pointer -;\13: event flag: an EVENT_* constant, or 0 for always - db \1, \2 + 4, \3 + 4, \4 - dn \5, \6 - db \7, \8 - shift - dn \8, \9 - shift - db \9 - shift - dw \9 - shift - dw \9 -endm - - -newgroup: macro -const_value = const_value + 1 - enum_start 1 -endm - -mapgroup: macro -;\1: map id -;\2: height: in blocks -;\3: width: in blocks -GROUP_\1 EQU const_value - enum MAP_\1 -\1_HEIGHT EQU \2 -\1_WIDTH EQU \3 -endm - - -map_header: macro -;\1: map label -;\2: tileset: a TILESET_* constant -;\3: permission: TOWN, ROUTE, INDOOR, CAVE, PERM_5, GATE, or DUNGEON -;\4: location: from constants/landmark_constants.asm -;\5: music: a MUSIC_* constant -;\6: phone service flag: 1 to prevent phone calls -;\7: time of day: a PALETTE_* constant -;\8: fishing group: a FISHGROUP_* constant -\1_MapHeader: - db BANK(\1_SecondMapHeader), \2, \3 - dw \1_SecondMapHeader - db \4, \5 - dn \6, \7 - db \8 -endm - - -map_header_2: macro -;\1: map label -;\2: map id -;\3: border block -;\4: connections: sum of NORTH, SOUTH, WEST, and/or EAST, or 0 for none -\1_SecondMapHeader:: - db \3 - db \2_HEIGHT, \2_WIDTH - db BANK(\1_BlockData) - dw \1_BlockData - db BANK(\1_MapScriptHeader) - dw \1_MapScriptHeader - dw \1_MapEventHeader - db \4 -endm - -connection: macro -if "\1" == "north" -;\2: map id -;\3: map label (eventually will be rolled into map id) -;\4: x -;\5: offset? -;\6: strip length -;\7: this map id - map \2 - dw \3_BlockData + \2_WIDTH * (\2_HEIGHT - 3) + \5 - dw OverworldMap + \4 + 3 - db \6 - db \2_WIDTH - db \2_HEIGHT * 2 - 1 - db (\4 - \5) * -2 - dw OverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1 -endc - -if "\1" == "south" -;\2: map id -;\3: map label (eventually will be rolled into map id) -;\4: x -;\5: offset? -;\6: strip length -;\7: this map id - map \2 - dw \3_BlockData + \5 - dw OverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3 - db \6 - db \2_WIDTH - db 0 - db (\4 - \5) * -2 - dw OverworldMap + \2_WIDTH + 7 -endc - -if "\1" == "west" -;\2: map id -;\3: map label (eventually will be rolled into map id) -;\4: y -;\5: offset? -;\6: strip length -;\7: this map id - map \2 - dw \3_BlockData + (\2_WIDTH * \5) + \2_WIDTH - 3 - dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3) - db \6 - db \2_WIDTH - db (\4 - \5) * -2 - db \2_WIDTH * 2 - 1 - dw OverworldMap + \2_WIDTH * 2 + 6 -endc - -if "\1" == "east" -;\2: map id -;\3: map label (eventually will be rolled into map id) -;\4: y -;\5: offset? -;\6: strip length -;\7: this map id - map \2 - dw \3_BlockData + (\2_WIDTH * \5) - dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3 - db \6 - db \2_WIDTH - db (\4 - \5) * -2 - db 0 - dw OverworldMap + \2_WIDTH + 7 -endc -endm - - -itemball: macro -;\1: item: from constants/item_constants.asm -;\2: quantity: default 1 -if _NARG == 2 - db \1, \2 -else - db \1, 1 -endc -endm - -elevfloor: macro -;\1: floor: a FLOOR_* constant -;\2: warp destination: starts at 1 -;\3: map id - db \1, \2 - map \3 -ENDM - -stonetable: macro -;\1: warp id -;\2: person_event id -;\3: script pointer - db \1, \2 - dw \3 -endm diff --git a/macros/mobile.asm b/macros/mobile.asm deleted file mode 100644 index 06b40d694..000000000 --- a/macros/mobile.asm +++ /dev/null @@ -1,2 +0,0 @@ -; Many mobile functions were dummied out in localization. -mobile EQUS "ret" diff --git a/macros/movement.asm b/macros/movement.asm deleted file mode 100644 index a2acf1356..000000000 --- a/macros/movement.asm +++ /dev/null @@ -1,247 +0,0 @@ -; MovementPointers indexes (see engine/movement.asm) - enum_start - -; Directional movements - - enum movement_turn_head -turn_head: macro - db movement_turn_head | \1 ; $00 - endm - -__enum__ = __enum__ + 3 - - enum movement_turn_step -turn_step: macro - db movement_turn_step | \1 ; $04 - endm - -__enum__ = __enum__ + 3 - - enum movement_slow_step -slow_step: macro - db movement_slow_step | \1; $08 - endm - -__enum__ = __enum__ + 3 - - enum movement_step -step: macro - db movement_step | \1 ; $0c - endm - -__enum__ = __enum__ + 3 - - enum movement_big_step -big_step: macro - db movement_big_step | \1 ; $10 - endm - -__enum__ = __enum__ + 3 - - enum movement_slow_slide_step -slow_slide_step: macro - db movement_slow_slide_step | \1 ; $14 - endm - -__enum__ = __enum__ + 3 - - enum movement_slide_step -slide_step: macro - db movement_slide_step | \1 ; $18 - endm - -__enum__ = __enum__ + 3 - - enum movement_fast_slide_step -fast_slide_step: macro - db movement_fast_slide_step | \1 ; $1c - endm - -__enum__ = __enum__ + 3 - - enum movement_turn_away -turn_away: macro - db movement_turn_away | \1 ; $20 - endm - -__enum__ = __enum__ + 3 - - enum movement_turn_in -turn_in: macro - db movement_turn_in | \1 ; $24 - endm - -__enum__ = __enum__ + 3 - - enum movement_turn_waterfall -turn_waterfall: macro - db movement_turn_waterfall | \1 ; $28 - endm - -__enum__ = __enum__ + 3 - - enum movement_slow_jump_step -slow_jump_step: macro - db movement_slow_jump_step | \1 ; $2c - endm - -__enum__ = __enum__ + 3 - - enum movement_jump_step -jump_step: macro - db movement_jump_step | \1 ; $30 - endm - -__enum__ = __enum__ + 3 - - enum movement_fast_jump_step -fast_jump_step: macro - db movement_fast_jump_step | \1 ; $34 - endm - -__enum__ = __enum__ + 3 - -; Control - enum movement_remove_sliding -remove_sliding: macro - db movement_remove_sliding ; $38 - endm - - enum movement_set_sliding -set_sliding: macro - db movement_set_sliding ; $39 - endm - - enum movement_remove_fixed_facing -remove_fixed_facing: macro - db movement_remove_fixed_facing ; $3a - endm - - enum movement_fix_facing -fix_facing: macro - db movement_fix_facing ; $3b - endm - - enum movement_show_person -show_person: macro - db movement_show_person ; $3c - endm - - enum movement_hide_person -hide_person: macro - db movement_hide_person ; $3d - endm - -; Sleep - - enum movement_step_sleep -step_sleep: macro -if \1 <= 8 - db movement_step_sleep + \1 - 1 -else - db movement_step_sleep + 8, \1 -endc -endm - -__enum__ = __enum__ + 8 - - enum movement_step_end -step_end: macro - db movement_step_end ; $47 - endm - -; Whatever Movement_48 is, it takes a one-byte parameter - enum movement_step_48 -step_48: macro - db movement_step_48 - db \1 - endm - - enum movement_remove_person -remove_person: macro - db movement_remove_person ; $49 - endm - - enum movement_step_loop -step_loop: macro - db movement_step_loop ; $4a - endm - - enum movement_step_4b -step_4b: macro - db movement_step_4b ; $4b - endm - - enum movement_teleport_from -teleport_from: macro - db movement_teleport_from ; $4c - endm - - enum movement_teleport_to -teleport_to: macro - db movement_teleport_to ; $4d - endm - - enum movement_skyfall -skyfall: macro - db movement_skyfall ; $4e - endm - - enum movement_step_dig -step_dig: macro - db movement_step_dig ; $4f - db \1 - endm - - enum movement_step_bump -step_bump: macro - db movement_step_bump ; $50 - endm - - enum movement_fish_got_bite -fish_got_bite: macro - db movement_fish_got_bite ; $51 - endm - - enum movement_fish_cast_rod -fish_cast_rod: macro - db movement_fish_cast_rod ; $52 - endm - - enum movement_hide_emote -hide_emote: macro - db movement_hide_emote ; $53 - endm - - enum movement_show_emote -show_emote: macro - db movement_show_emote ; $54 - endm - - enum movement_step_shake -step_shake: macro - db movement_step_shake ; $55 - db \1 ; displacement - endm - - enum movement_tree_shake -tree_shake: macro - db movement_tree_shake - endm - - enum movement_rock_smash -rock_smash: macro - db movement_rock_smash ; $57 - db \1 - endm - - enum movement_return_dig -return_dig: macro - db movement_return_dig ; $58 - db \1 - endm - - enum movement_skyfall_top -skyfall_top: macro - db movement_skyfall_top ; $59 - endm diff --git a/macros/pic.asm b/macros/pic.asm deleted file mode 100644 index f06c6cd4f..000000000 --- a/macros/pic.asm +++ /dev/null @@ -1,4 +0,0 @@ -add_pic: MACRO - db BANK(\1) - PICS_FIX - dw \1 -ENDM diff --git a/macros/rst.asm b/macros/rst.asm index 50259c968..fe7e42723 100644 --- a/macros/rst.asm +++ b/macros/rst.asm @@ -15,3 +15,15 @@ callab: MACRO ; address, bank ld a, BANK(\1) rst FarCall ENDM + +homecall: MACRO + ld a, [hROMBank] + push af + ld a, BANK(\1) + rst Bankswitch + + call \1 + + pop af + rst Bankswitch +ENDM diff --git a/macros/sound.asm b/macros/scripts/audio.asm similarity index 72% rename from macros/sound.asm rename to macros/scripts/audio.asm index bac979a5f..3766785ba 100644 --- a/macros/sound.asm +++ b/macros/scripts/audio.asm @@ -26,7 +26,7 @@ cry_header: macro ; MusicCommands indexes (see audio/engine.asm) enum_start $d8 - enum notetype_cmd + enum notetype_cmd ; $d8 octave: macro db notetype_cmd - (\1) endm @@ -39,227 +39,227 @@ notetype: macro endc endm - enum pitchoffset_cmd + enum pitchoffset_cmd ; $d9 pitchoffset: macro db pitchoffset_cmd dn \1, \2 - 1 ; octave, key endm - enum tempo_cmd + enum tempo_cmd ; $da tempo: macro db tempo_cmd bigdw \1 ; tempo endm - enum dutycycle_cmd + enum dutycycle_cmd ; $db dutycycle: macro db dutycycle_cmd db \1 ; duty_cycle endm - enum intensity_cmd + enum intensity_cmd ; $dc intensity: macro db intensity_cmd db \1 ; intensity endm - enum soundinput_cmd + enum soundinput_cmd ; $dd soundinput: macro db soundinput_cmd db \1 ; input endm - enum sound_duty_cmd + enum sound_duty_cmd ; $de sound_duty: macro db sound_duty_cmd db \1 | (\2 << 2) | (\3 << 4) | (\4 << 6) ; duty sequence endm - enum togglesfx_cmd + enum togglesfx_cmd ; $df togglesfx: macro db togglesfx_cmd endm - enum slidepitchto_cmd + enum slidepitchto_cmd ; $e0 slidepitchto: macro db slidepitchto_cmd db \1 - 1 ; duration dn \2, \3 ; octave, pitch endm - enum vibrato_cmd + enum vibrato_cmd ; $e1 vibrato: macro db vibrato_cmd db \1 ; delay db \2 ; extent endm - enum unknownmusic0xe2_cmd + enum unknownmusic0xe2_cmd ; $e2 unknownmusic0xe2: macro db unknownmusic0xe2_cmd db \1 ; unknown endm - enum togglenoise_cmd + enum togglenoise_cmd ; $e3 togglenoise: macro db togglenoise_cmd db \1 ; id endm - enum panning_cmd + enum panning_cmd ; $e4 panning: macro db panning_cmd db \1 ; tracks endm - enum volume_cmd + enum volume_cmd ; $e5 volume: macro db volume_cmd db \1 ; volume endm - enum tone_cmd + enum tone_cmd ; $e6 tone: macro db tone_cmd bigdw \1 ; tone endm - enum unknownmusic0xe7_cmd + enum unknownmusic0xe7_cmd ; $e7 unknownmusic0xe7: macro db unknownmusic0xe7_cmd db \1 ; unknown endm - enum unknownmusic0xe8_cmd + enum unknownmusic0xe8_cmd ; $e8 unknownmusic0xe8: macro db unknownmusic0xe8_cmd db \1 ; unknown endm - enum tempo_relative_cmd + enum tempo_relative_cmd ; $e9 tempo_relative: macro db tempo_relative_cmd bigdw \1 ; value endm - enum restartchannel_cmd + enum restartchannel_cmd ; $ea restartchannel: macro db restartchannel_cmd dw \1 ; address endm - enum newsong_cmd + enum newsong_cmd ; $eb newsong: macro db newsong_cmd bigdw \1 ; id endm - enum sfxpriorityon_cmd + enum sfxpriorityon_cmd ; $ec sfxpriorityon: macro db sfxpriorityon_cmd endm - enum sfxpriorityoff_cmd + enum sfxpriorityoff_cmd ; $ed sfxpriorityoff: macro db sfxpriorityoff_cmd endm - enum unknownmusic0xee_cmd + enum unknownmusic0xee_cmd ; $ee unknownmusic0xee: macro db unknownmusic0xee_cmd dw \1 ; address endm - enum stereopanning_cmd + enum stereopanning_cmd ; $ef stereopanning: macro db stereopanning_cmd db \1 ; tracks endm - enum sfxtogglenoise_cmd + enum sfxtogglenoise_cmd ; $f0 sfxtogglenoise: macro db sfxtogglenoise_cmd db \1 ; id endm - enum music0xf1_cmd + enum music0xf1_cmd ; $f1 music0xf1: macro db music0xf1_cmd endm - enum music0xf2_cmd + enum music0xf2_cmd ; $f2 music0xf2: macro db music0xf2_cmd endm - enum music0xf3_cmd + enum music0xf3_cmd ; $f3 music0xf3: macro db music0xf3_cmd endm - enum music0xf4_cmd + enum music0xf4_cmd ; $f4 music0xf4: macro db music0xf4_cmd endm - enum music0xf5_cmd + enum music0xf5_cmd ; $f5 music0xf5: macro db music0xf5_cmd endm - enum music0xf6_cmd + enum music0xf6_cmd ; $f6 music0xf6: macro db music0xf6_cmd endm - enum music0xf7_cmd + enum music0xf7_cmd ; $f7 music0xf7: macro db music0xf7_cmd endm - enum music0xf8_cmd + enum music0xf8_cmd ; $f8 music0xf8: macro db music0xf8_cmd endm - enum unknownmusic0xf9_cmd + enum unknownmusic0xf9_cmd ; $f9 unknownmusic0xf9: macro db unknownmusic0xf9_cmd endm - enum setcondition_cmd + enum setcondition_cmd ; $fa setcondition: macro db setcondition_cmd db \1 ; condition endm - enum jumpif_cmd + enum jumpif_cmd ; $fb jumpif: macro db jumpif_cmd db \1 ; condition dw \2 ; address endm - enum jumpchannel_cmd + enum jumpchannel_cmd ; $fc jumpchannel: macro db jumpchannel_cmd dw \1 ; address endm - enum loopchannel_cmd + enum loopchannel_cmd ; $fd loopchannel: macro db loopchannel_cmd db \1 ; count dw \2 ; address endm - enum callchannel_cmd + enum callchannel_cmd ; $fe callchannel: macro db callchannel_cmd dw \1 ; address endm - enum endchannel_cmd + enum endchannel_cmd ; $ff endchannel: macro db endchannel_cmd endm diff --git a/constants/effect_command_constants.asm b/macros/scripts/effect_commands.asm similarity index 98% rename from constants/effect_command_constants.asm rename to macros/scripts/effect_commands.asm index 0d86e66a1..4fd2475b7 100644 --- a/constants/effect_command_constants.asm +++ b/macros/scripts/effect_commands.asm @@ -1,10 +1,9 @@ -; BattleCommandPointers indexes (see battle/effect_commands.asm) - command: macro enum \1_command \1 equs "db \1_command" endm +; BattleCommandPointers indexes (see battle/effect_commands.asm) enum_start 1 command checkturn ; 01 command checkobedience ; 02 @@ -182,6 +181,7 @@ endm command startloop ; ae command curl ; af - enum_start -1, -1 - command endmove - command endturn +__enum__ set $fe + + command endturn ; fe + command endmove ; ff diff --git a/macros/event.asm b/macros/scripts/event.asm similarity index 68% rename from macros/event.asm rename to macros/scripts/event.asm index b00b6a6da..c40d6f8fd 100644 --- a/macros/event.asm +++ b/macros/scripts/event.asm @@ -1,101 +1,101 @@ ; ScriptCommandTable indexes (see engine/scripting.asm) enum_start - enum scall_command + enum scall_command ; $00 scall: macro db scall_command dw \1 ; pointer endm - enum farscall_command + enum farscall_command ; $01 farscall: macro db farscall_command dba \1 endm - enum ptcall_command + enum ptcall_command ; $02 ptcall: macro db ptcall_command dw \1 ; pointer endm - enum jump_command + enum jump_command ; $03 jump: macro db jump_command dw \1 ; pointer endm - enum farjump_command + enum farjump_command ; $04 farjump: macro db farjump_command dba \1 endm - enum ptjump_command + enum ptjump_command ; $05 ptjump: macro db ptjump_command dw \1 ; pointer endm - enum if_equal_command + enum if_equal_command ; $06 if_equal: macro db if_equal_command db \1 ; byte dw \2 ; pointer endm - enum if_not_equal_command + enum if_not_equal_command ; $07 if_not_equal: macro db if_not_equal_command db \1 ; byte dw \2 ; pointer endm - enum iffalse_command + enum iffalse_command ; $08 iffalse: macro db iffalse_command dw \1 ; pointer endm - enum iftrue_command + enum iftrue_command ; $09 iftrue: macro db iftrue_command dw \1 ; pointer endm - enum if_greater_than_command + enum if_greater_than_command ; $0a if_greater_than: macro db if_greater_than_command db \1 ; byte dw \2 ; pointer endm - enum if_less_than_command + enum if_less_than_command ; $0b if_less_than: macro db if_less_than_command db \1 ; byte dw \2 ; pointer endm - enum jumpstd_command + enum jumpstd_command ; $0c jumpstd: macro db jumpstd_command dw \1 ; predefined_script endm - enum callstd_command + enum callstd_command ; $0d callstd: macro db callstd_command dw \1 ; predefined_script endm - enum callasm_command + enum callasm_command ; $0e callasm: macro db callasm_command dba \1 endm - enum special_command + enum special_command ; $0f special: macro db special_command dw (\1Special - SpecialsPointers) / 3 @@ -106,98 +106,98 @@ add_special: MACRO dba \1 ENDM - enum ptcallasm_command + enum ptcallasm_command ; $10 ptcallasm: macro db ptcallasm_command dw \1 ; asm endm - enum checkmaptriggers_command + enum checkmaptriggers_command ; $11 checkmaptriggers: macro db checkmaptriggers_command map \1 ; map endm - enum domaptrigger_command + enum domaptrigger_command ; $12 domaptrigger: macro db domaptrigger_command map \1 ; map db \2 ; trigger_id endm - enum checktriggers_command + enum checktriggers_command ; $13 checktriggers: macro db checktriggers_command endm - enum dotrigger_command + enum dotrigger_command ; $14 dotrigger: macro db dotrigger_command db \1 ; trigger_id endm - enum writebyte_command + enum writebyte_command ; $15 writebyte: macro db writebyte_command db \1 ; value endm - enum addvar_command + enum addvar_command ; $16 addvar: macro db addvar_command db \1 ; value endm - enum random_command + enum random_command ; $17 random: macro db random_command db \1 ; input endm - enum checkver_command + enum checkver_command ; $18 checkver: macro db checkver_command endm - enum copybytetovar_command + enum copybytetovar_command ; $19 copybytetovar: macro db copybytetovar_command dw \1 ; address endm - enum copyvartobyte_command + enum copyvartobyte_command ; $1a copyvartobyte: macro db copyvartobyte_command dw \1 ; address endm - enum loadvar_command + enum loadvar_command ; $1b loadvar: macro db loadvar_command dw \1 ; address db \2 ; value endm - enum checkcode_command + enum checkcode_command ; $1c checkcode: macro db checkcode_command db \1 ; variable_id endm - enum writevarcode_command + enum writevarcode_command ; $1d writevarcode: macro db writevarcode_command db \1 ; variable_id endm - enum writecode_command + enum writecode_command ; $1e writecode: macro db writecode_command db \1 ; variable_id db \2 ; value endm - enum giveitem_command + enum giveitem_command ; $1f giveitem: macro db giveitem_command db \1 ; item @@ -208,7 +208,7 @@ else endc endm - enum takeitem_command + enum takeitem_command ; $20 takeitem: macro db takeitem_command db \1 ; item @@ -219,70 +219,70 @@ else endc endm - enum checkitem_command + enum checkitem_command ; $21 checkitem: macro db checkitem_command db \1 ; item endm - enum givemoney_command + enum givemoney_command ; $22 givemoney: macro db givemoney_command db \1 ; account dt \2 ; money endm - enum takemoney_command + enum takemoney_command ; $23 takemoney: macro db takemoney_command db \1 ; account dt \2 ; money endm - enum checkmoney_command + enum checkmoney_command ; $24 checkmoney: macro db checkmoney_command db \1 ; account dt \2 ; money endm - enum givecoins_command + enum givecoins_command ; $25 givecoins: macro db givecoins_command dw \1 ; coins endm - enum takecoins_command + enum takecoins_command ; $26 takecoins: macro db takecoins_command dw \1 ; coins endm - enum checkcoins_command + enum checkcoins_command ; $27 checkcoins: macro db checkcoins_command dw \1 ; coins endm - enum addcellnum_command + enum addcellnum_command ; $28 addcellnum: macro db addcellnum_command db \1 ; person endm - enum delcellnum_command + enum delcellnum_command ; $29 delcellnum: macro db delcellnum_command db \1 ; person endm - enum checkcellnum_command + enum checkcellnum_command ; $2a checkcellnum: macro db checkcellnum_command db \1 ; person endm - enum checktime_command + enum checktime_command ; $2b checktime: macro db checktime_command db \1 ; time @@ -292,13 +292,13 @@ checkmorn EQUS "checktime MORN" checkday EQUS "checktime DAY" checknite EQUS "checktime NITE" - enum checkpoke_command + enum checkpoke_command ; $2c checkpoke: macro db checkpoke_command db \1 ; pkmn endm - enum givepoke_command + enum givepoke_command ; $2d givepoke: macro db givepoke_command db \1 ; pokemon @@ -319,91 +319,91 @@ givepoke: macro endc endm - enum giveegg_command + enum giveegg_command ; $2e giveegg: macro db giveegg_command db \1 ; pkmn db \2 ; level endm - enum givepokeitem_command + enum givepokeitem_command ; $2f givepokeitem: macro db givepokeitem_command dw \1 ; pointer endm - enum checkpokeitem_command + enum checkpokeitem_command ; $30 checkpokeitem: macro db checkpokeitem_command dw \1 ; pointer endm - enum checkevent_command + enum checkevent_command ; $31 checkevent: macro db checkevent_command dw \1 ; event_flag endm - enum clearevent_command + enum clearevent_command ; $32 clearevent: macro db clearevent_command dw \1 ; event_flag endm - enum setevent_command + enum setevent_command ; $33 setevent: macro db setevent_command dw \1 ; event_flag endm - enum checkflag_command + enum checkflag_command ; $34 checkflag: macro db checkflag_command dw \1 ; engine_flag endm - enum clearflag_command + enum clearflag_command ; $35 clearflag: macro db clearflag_command dw \1 ; engine_flag endm - enum setflag_command + enum setflag_command ; $36 setflag: macro db setflag_command dw \1 ; engine_flag endm - enum wildon_command + enum wildon_command ; $37 wildon: macro db wildon_command endm - enum wildoff_command + enum wildoff_command ; $38 wildoff: macro db wildoff_command endm - enum xycompare_command + enum xycompare_command ; $39 xycompare: macro db xycompare_command dw \1 ; pointer endm - enum warpmod_command + enum warpmod_command ; $3a warpmod: macro db warpmod_command db \1 ; warp_id map \2 ; map endm - enum blackoutmod_command + enum blackoutmod_command ; $3b blackoutmod: macro db blackoutmod_command map \1 ; map endm - enum warp_command + enum warp_command ; $3c warp: macro db warp_command map \1 ; map @@ -411,46 +411,46 @@ warp: macro db \3 ; y endm - enum readmoney_command + enum readmoney_command ; $3d readmoney: macro db readmoney_command db \1 ; account db \2 ; memory endm - enum readcoins_command + enum readcoins_command ; $3e readcoins: macro db readcoins_command db \1 ; memory endm - enum RAM2MEM_command + enum RAM2MEM_command ; $3f RAM2MEM: macro db RAM2MEM_command db \1 ; memory endm - enum pokenamemem_command + enum pokenamemem_command ; $40 pokenamemem: macro db pokenamemem_command db \1 ; pokemon db \2 ; memory endm - enum itemtotext_command + enum itemtotext_command ; $41 itemtotext: macro db itemtotext_command db \1 ; item db \2 ; memory endm - enum mapnametotext_command + enum mapnametotext_command ; $42 mapnametotext: macro db mapnametotext_command db \1 ; memory endm - enum trainertotext_command + enum trainertotext_command ; $43 trainertotext: macro db trainertotext_command db \1 ; trainer_id @@ -458,273 +458,273 @@ trainertotext: macro db \3 ; memory endm - enum stringtotext_command + enum stringtotext_command ; $44 stringtotext: macro db stringtotext_command dw \1 ; text_pointer db \2 ; memory endm - enum itemnotify_command + enum itemnotify_command ; $45 itemnotify: macro db itemnotify_command endm - enum pocketisfull_command + enum pocketisfull_command ; $46 pocketisfull: macro db pocketisfull_command endm - enum opentext_command + enum opentext_command ; $47 opentext: macro db opentext_command endm - enum refreshscreen_command + enum refreshscreen_command ; $48 refreshscreen: macro db refreshscreen_command db \1 ; dummy endm - enum closetext_command + enum closetext_command ; $49 closetext: macro db closetext_command endm - enum loadbytec2cf_command + enum loadbytec2cf_command ; $4a loadbytec2cf: macro db loadbytec2cf_command db \1 ; byte endm - enum farwritetext_command + enum farwritetext_command ; $4b farwritetext: macro db farwritetext_command dba \1 endm - enum writetext_command + enum writetext_command ; $4c writetext: macro db writetext_command dw \1 ; text_pointer endm - enum repeattext_command + enum repeattext_command ; $4d repeattext: macro db repeattext_command db \1 ; byte db \2 ; byte endm - enum yesorno_command + enum yesorno_command ; $4e yesorno: macro db yesorno_command endm - enum loadmenudata_command + enum loadmenudata_command ; $4f loadmenudata: macro db loadmenudata_command dw \1 ; data endm - enum closewindow_command + enum closewindow_command ; $50 closewindow: macro db closewindow_command endm - enum jumptextfaceplayer_command + enum jumptextfaceplayer_command ; $51 jumptextfaceplayer: macro db jumptextfaceplayer_command dw \1 ; text_pointer endm ; IF _CRYSTAL - enum farjumptext_command + enum farjumptext_command ; $52 farjumptext: macro db farjumptext_command dba \1 endm ; ENDC - enum jumptext_command + enum jumptext_command ; $53 jumptext: macro db jumptext_command dw \1 ; text_pointer endm - enum waitbutton_command + enum waitbutton_command ; $54 waitbutton: macro db waitbutton_command endm - enum buttonsound_command + enum buttonsound_command ; $55 buttonsound: macro db buttonsound_command endm - enum pokepic_command + enum pokepic_command ; $56 pokepic: macro db pokepic_command db \1 ; pokemon endm - enum closepokepic_command + enum closepokepic_command ; $57 closepokepic: macro db closepokepic_command endm - enum _2dmenu_command + enum _2dmenu_command ; $58 _2dmenu: macro db _2dmenu_command endm - enum verticalmenu_command + enum verticalmenu_command ; $59 verticalmenu: macro db verticalmenu_command endm - enum loadpikachudata_command + enum loadpikachudata_command ; $5a loadpikachudata: macro db loadpikachudata_command endm - enum randomwildmon_command + enum randomwildmon_command ; $5b randomwildmon: macro db randomwildmon_command endm - enum loadmemtrainer_command + enum loadmemtrainer_command ; $5c loadmemtrainer: macro db loadmemtrainer_command endm - enum loadwildmon_command + enum loadwildmon_command ; $5d loadwildmon: macro db loadwildmon_command db \1 ; pokemon db \2 ; level endm - enum loadtrainer_command + enum loadtrainer_command ; $5e loadtrainer: macro db loadtrainer_command db \1 ; trainer_group db \2 ; trainer_id endm - enum startbattle_command + enum startbattle_command ; $5f startbattle: macro db startbattle_command endm - enum reloadmapafterbattle_command + enum reloadmapafterbattle_command ; $60 reloadmapafterbattle: macro db reloadmapafterbattle_command endm - enum catchtutorial_command + enum catchtutorial_command ; $61 catchtutorial: macro db catchtutorial_command db \1 ; byte endm - enum trainertext_command + enum trainertext_command ; $62 trainertext: macro db trainertext_command db \1 ; which_text endm - enum trainerflagaction_command + enum trainerflagaction_command ; $63 trainerflagaction: macro db trainerflagaction_command db \1 ; action endm - enum winlosstext_command + enum winlosstext_command ; $64 winlosstext: macro db winlosstext_command dw \1 ; win_text_pointer dw \2 ; loss_text_pointer endm - enum scripttalkafter_command + enum scripttalkafter_command ; $65 scripttalkafter: macro db scripttalkafter_command endm - enum end_if_just_battled_command + enum end_if_just_battled_command ; $66 end_if_just_battled: macro db end_if_just_battled_command endm - enum check_just_battled_command + enum check_just_battled_command ; $67 check_just_battled: macro db check_just_battled_command endm - enum setlasttalked_command + enum setlasttalked_command ; $68 setlasttalked: macro db setlasttalked_command db \1 ; person endm - enum applymovement_command + enum applymovement_command ; $69 applymovement: macro db applymovement_command db \1 ; person dw \2 ; data endm - enum applymovement2_command + enum applymovement2_command ; $6a applymovement2: macro db applymovement2_command dw \1 ; data endm - enum faceplayer_command + enum faceplayer_command ; $6b faceplayer: macro db faceplayer_command endm - enum faceperson_command + enum faceperson_command ; $6c faceperson: macro db faceperson_command db \1 ; person1 db \2 ; person2 endm - enum variablesprite_command + enum variablesprite_command ; $6d variablesprite: macro db variablesprite_command db \1 - SPRITE_VARS ; byte db \2 ; sprite endm - enum disappear_command + enum disappear_command ; $6e disappear: macro db disappear_command db \1 ; person endm - enum appear_command + enum appear_command ; $6f appear: macro db appear_command db \1 ; person endm - enum follow_command + enum follow_command ; $70 follow: macro db follow_command db \1 ; person2 db \2 ; person1 endm - enum stopfollow_command + enum stopfollow_command ; $71 stopfollow: macro db stopfollow_command endm - enum moveperson_command + enum moveperson_command ; $72 moveperson: macro db moveperson_command db \1 ; person @@ -732,19 +732,19 @@ moveperson: macro db \3 ; y endm - enum writepersonxy_command + enum writepersonxy_command ; $73 writepersonxy: macro db writepersonxy_command db \1 ; person endm - enum loademote_command + enum loademote_command ; $74 loademote: macro db loademote_command db \1 ; bubble endm - enum showemote_command + enum showemote_command ; $75 showemote: macro db showemote_command db \1 ; bubble @@ -752,34 +752,34 @@ showemote: macro db \3 ; time endm - enum spriteface_command + enum spriteface_command ; $76 spriteface: macro db spriteface_command db \1 ; person db \2 ; facing endm - enum follownotexact_command + enum follownotexact_command ; $77 follownotexact: macro db follownotexact_command db \1 ; person2 db \2 ; person1 endm - enum earthquake_command + enum earthquake_command ; $78 earthquake: macro db earthquake_command db \1 ; param endm - enum changemap_command + enum changemap_command ; $79 changemap: macro db changemap_command db \1 ; map_bank dw \2 ; map_data_pointer endm - enum changeblock_command + enum changeblock_command ; $7a changeblock: macro db changeblock_command db \1 ; x @@ -787,205 +787,205 @@ changeblock: macro db \3 ; block endm - enum reloadmap_command + enum reloadmap_command ; $7b reloadmap: macro db reloadmap_command endm - enum reloadmappart_command + enum reloadmappart_command ; $7c reloadmappart: macro db reloadmappart_command endm - enum writecmdqueue_command + enum writecmdqueue_command ; $7d writecmdqueue: macro db writecmdqueue_command dw \1 ; queue_pointer endm - enum delcmdqueue_command + enum delcmdqueue_command ; $7e delcmdqueue: macro db delcmdqueue_command db \1 ; byte endm - enum playmusic_command + enum playmusic_command ; $7f playmusic: macro db playmusic_command dw \1 ; music_pointer endm - enum encountermusic_command + enum encountermusic_command ; $80 encountermusic: macro db encountermusic_command endm - enum musicfadeout_command + enum musicfadeout_command ; $81 musicfadeout: macro db musicfadeout_command dw \1 ; music db \2 ; fadetime endm - enum playmapmusic_command + enum playmapmusic_command ; $82 playmapmusic: macro db playmapmusic_command endm - enum dontrestartmapmusic_command + enum dontrestartmapmusic_command ; $83 dontrestartmapmusic: macro db dontrestartmapmusic_command endm - enum cry_command + enum cry_command ; $84 cry: macro db cry_command dw \1 ; cry_id endm - enum playsound_command + enum playsound_command ; $85 playsound: macro db playsound_command dw \1 ; sound_pointer endm - enum waitsfx_command + enum waitsfx_command ; $86 waitsfx: macro db waitsfx_command endm - enum warpsound_command + enum warpsound_command ; $87 warpsound: macro db warpsound_command endm - enum specialsound_command + enum specialsound_command ; $88 specialsound: macro db specialsound_command endm - enum passtoengine_command + enum passtoengine_command ; $89 passtoengine: macro db passtoengine_command db \1 ; data_pointer endm - enum newloadmap_command + enum newloadmap_command ; $8a newloadmap: macro db newloadmap_command db \1 ; which_method endm - enum pause_command + enum pause_command ; $8b pause: macro db pause_command db \1 ; length endm - enum deactivatefacing_command + enum deactivatefacing_command ; $8c deactivatefacing: macro db deactivatefacing_command db \1 ; time endm - enum priorityjump_command + enum priorityjump_command ; $8d priorityjump: macro db priorityjump_command dw \1 ; pointer endm - enum warpcheck_command + enum warpcheck_command ; $8e warpcheck: macro db warpcheck_command endm - enum ptpriorityjump_command + enum ptpriorityjump_command ; $8f ptpriorityjump: macro db ptpriorityjump_command dw \1 ; pointer endm - enum return_command + enum return_command ; $90 return: macro db return_command endm - enum end_command + enum end_command ; $91 end: macro db end_command endm - enum reloadandreturn_command + enum reloadandreturn_command ; $92 reloadandreturn: macro db reloadandreturn_command db \1 ; which_method endm - enum end_all_command + enum end_all_command ; $93 end_all: macro db end_all_command endm - enum pokemart_command + enum pokemart_command ; $94 pokemart: macro db pokemart_command db \1 ; dialog_id dw \2 ; mart_id endm - enum elevator_command + enum elevator_command ; $95 elevator: macro db elevator_command dw \1 ; floor_list_pointer endm - enum trade_command + enum trade_command ; $96 trade: macro db trade_command db \1 ; trade_id endm - enum askforphonenumber_command + enum askforphonenumber_command ; $97 askforphonenumber: macro db askforphonenumber_command db \1 ; number endm - enum phonecall_command + enum phonecall_command ; $98 phonecall: macro db phonecall_command dw \1 ; caller_name endm - enum hangup_command + enum hangup_command ; $99 hangup: macro db hangup_command endm - enum describedecoration_command + enum describedecoration_command ; $9a describedecoration: macro db describedecoration_command db \1 ; byte endm - enum fruittree_command + enum fruittree_command ; $9b fruittree: macro db fruittree_command db \1 ; tree_id endm - enum specialphonecall_command + enum specialphonecall_command ; $9c specialphonecall: macro db specialphonecall_command dw \1 ; call_id endm - enum checkphonecall_command + enum checkphonecall_command ; $9d checkphonecall: macro db checkphonecall_command endm - enum verbosegiveitem_command + enum verbosegiveitem_command ; $9e verbosegiveitem: macro db verbosegiveitem_command db \1 ; item @@ -996,31 +996,31 @@ else endc endm - enum verbosegiveitem2_command + enum verbosegiveitem2_command ; $9f verbosegiveitem2: macro db verbosegiveitem2_command db \1 ; item db \2 ; var endm - enum swarm_command + enum swarm_command ; $a0 swarm: macro db swarm_command db \1 ; flag map \2 ; map endm - enum halloffame_command + enum halloffame_command ; $a1 halloffame: macro db halloffame_command endm - enum credits_command + enum credits_command ; $a2 credits: macro db credits_command endm - enum warpfacing_command + enum warpfacing_command ; $a3 warpfacing: macro db warpfacing_command db \1 ; facing @@ -1029,27 +1029,27 @@ warpfacing: macro db \4 ; y endm - enum battletowertext_command + enum battletowertext_command ; $a4 battletowertext: macro db battletowertext_command db \1 ; memory endm - enum landmarktotext_command + enum landmarktotext_command ; $a5 landmarktotext: macro db landmarktotext_command db \1 ; id db \2 ; memory endm - enum trainerclassname_command + enum trainerclassname_command ; $a6 trainerclassname: macro db trainerclassname_command db \1 ; id db \2 ; memory endm - enum name_command + enum name_command ; $a7 name: macro db name_command db \1 ; type @@ -1057,13 +1057,13 @@ name: macro db \3 ; memory endm - enum wait_command + enum wait_command ; $a8 wait: macro db wait_command db \1 ; duration endm - enum check_save_command + enum check_save_command ; $a9 check_save: macro db check_save_command endm diff --git a/macros/scripts/gfx_anim.asm b/macros/scripts/gfx_anim.asm new file mode 100644 index 000000000..a3fa710a0 --- /dev/null +++ b/macros/scripts/gfx_anim.asm @@ -0,0 +1,44 @@ +; pic + oam animations + +frame: macro + db \1 +x = \2 +if _NARG > 2 +rept _NARG +- 2 +x = x | (1 << (\3 + 1)) + shift +endr +endc + db x + endm + + enum_start $fc + + enum delanim_command ; $fc +delanim: macro ; used for oam + db delanim_command + endm + + enum dorepeat_command ; $fd +dorepeat: macro + db dorepeat_command + db \1 ; # + endm + + enum setrepeat_command ; $fe +setrepeat: macro + db setrepeat_command + db \1 ; # + endm + + enum endanim_command ; $ff +endanim: macro + db endanim_command + endm + +__enum__ = $fe + + enum dorestart_command ; $fe +dorestart: macro ; used for oam + db dorestart_command + endm diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm new file mode 100644 index 000000000..6c1e0b6b6 --- /dev/null +++ b/macros/scripts/maps.asm @@ -0,0 +1,108 @@ +map: macro +;\1: map id + db GROUP_\1, MAP_\1 +endm + + +maptrigger: macro +;\1: script pointer + dw \1, 0 +endm + +warp_def: macro +;\1: y: top to bottom, starts at 0 +;\2: x: left to right, starts at 0 +;\3: warp destination: starts at 1 +;\4: map id: from constants/map_constants.asm + db \1, \2, \3 + map \4 +endm + +xy_trigger: macro +;\1: number: controlled by dotrigger/domaptrigger +;\2: y: top to bottom, starts at 0 +;\3: x: left to right, starts at 0 +;\4: script pointer + db \1, \2, \3, $0 + dw \4 + db $0, $0 +endm + +signpost: macro +;\1: y: top to bottom, starts at 0 +;\2: x: left to right, starts at 0 +;\3: function: a SIGNPOST_* constant +;\4: script pointer + db \1, \2, \3 + dw \4 +endm + +person_event: macro +;\1: sprite: a SPRITE_* constant +;\2: y: top to bottom, starts at 0 +;\3: x: left to right, starts at 0 +;\4: movement function: a SPRITEMOVEDATA_* constant +;\5, \6: movement radius: y, x +;\7, \8: hour1 and hour2: control the hours a person_event is visible (0-23) +; * if hour1 < hour2, the person_event will only appear from hour1 to hour2 +; * if hour1 > hour2, the person_event will not appear from hour2 to hour1 +; * if hour1 == hour2, the person_event will always appear +; * if hour1 == -1, hour2 is treated as a time-of-day value: +; a combo of MORN, DAY, and/or NITE, or -1 to always appear +;\9: color: a PAL_NPC_* constant, or 0 for sprite default +;\10: function: a PERSONTYPE_* constant +;\11: sight range: applies to PERSONTYPE_TRAINER +;\12: script pointer +;\13: event flag: an EVENT_* constant, or 0 for always + db \1, \2 + 4, \3 + 4, \4 + dn \5, \6 + db \7, \8 + shift + dn \8, \9 + shift + db \9 + shift + dw \9 + shift + dw \9 +endm + + +trainer: macro +;\1: flag: an EVENT_BEAT_* constant +;\2: trainer group +;\3: trainer id +;\4: seen text +;\5: win text +;\6: loss text +;\7: after-battle text + dw \1 + db \2, \3 + dw \4, \5, \6, \7 +endm + +itemball: macro +;\1: item: from constants/item_constants.asm +;\2: quantity: default 1 +if _NARG == 2 + db \1, \2 +else + db \1, 1 +endc +endm + +elevfloor: macro +;\1: floor: a FLOOR_* constant +;\2: warp destination: starts at 1 +;\3: map id + db \1, \2 + map \3 +ENDM + +stonetable: macro +;\1: warp id +;\2: person_event id +;\3: script pointer + db \1, \2 + dw \3 +endm diff --git a/macros/move_anim.asm b/macros/scripts/move_anim.asm similarity index 67% rename from macros/move_anim.asm rename to macros/scripts/move_anim.asm index 9859fbd50..7714bb09a 100644 --- a/macros/move_anim.asm +++ b/macros/scripts/move_anim.asm @@ -8,7 +8,7 @@ endc ; BattleAnimCommands indexes (see battle/anim_commands.asm) enum_start $d0 - enum anim_obj_command ; d0 + enum anim_obj_command ; $d0 anim_obj: macro db anim_obj_command db \1 ; obj @@ -17,20 +17,20 @@ anim_obj: macro db \6 ; param endm - enum anim_1gfx_command ; d1 + enum anim_1gfx_command ; $d1 anim_1gfx: macro db anim_1gfx_command db \1 ; gfx1 endm - enum anim_2gfx_command ; d2 + enum anim_2gfx_command ; $d2 anim_2gfx: macro db anim_2gfx_command db \1 ; gfx1 db \2 ; gfx2 endm - enum anim_3gfx_command ; d3 + enum anim_3gfx_command ; $d3 anim_3gfx: macro db anim_3gfx_command db \1 ; gfx1 @@ -38,7 +38,7 @@ anim_3gfx: macro db \3 ; gfx3 endm - enum anim_4gfx_command ; d4 + enum anim_4gfx_command ; $d4 anim_4gfx: macro db anim_4gfx_command db \1 ; gfx1 @@ -47,7 +47,7 @@ anim_4gfx: macro db \4 ; gfx4 endm - enum anim_5gfx_command ; d5 + enum anim_5gfx_command ; $d5 anim_5gfx: macro db anim_5gfx_command db \1 ; gfx1 @@ -57,147 +57,147 @@ anim_5gfx: macro db \5 ; gfx5 endm - enum anim_incobj_command ; d6 + enum anim_incobj_command ; $d6 anim_incobj: macro db anim_incobj_command db \1 ; id endm - enum anim_setobj_command ; d7 + enum anim_setobj_command ; $d7 anim_setobj: macro db anim_setobj_command db \1 ; id db \2 ; obj endm - enum anim_incbgeffect_command ; d8 + enum anim_incbgeffect_command ; $d8 anim_incbgeffect: macro db anim_incbgeffect_command db \1 ; effect endm - enum anim_enemyfeetobj_command ; d9 + enum anim_enemyfeetobj_command ; $d9 anim_enemyfeetobj: macro db anim_enemyfeetobj_command endm - enum anim_playerheadobj_command ; da + enum anim_playerheadobj_command ; $da anim_playerheadobj: macro db anim_playerheadobj_command endm - enum anim_checkpokeball_command ; db + enum anim_checkpokeball_command ; $db anim_checkpokeball: macro db anim_checkpokeball_command endm - enum anim_transform_command ; dc + enum anim_transform_command ; $dc anim_transform: macro db anim_transform_command endm - enum anim_raisesub_command ; dd + enum anim_raisesub_command ; $dd anim_raisesub: macro db anim_raisesub_command endm - enum anim_dropsub_command ; de + enum anim_dropsub_command ; $de anim_dropsub: macro db anim_dropsub_command endm - enum anim_resetobp0_command ; df + enum anim_resetobp0_command ; $df anim_resetobp0: macro db anim_resetobp0_command endm - enum anim_sound_command ; e0 + enum anim_sound_command ; $e0 anim_sound: macro db anim_sound_command db (\1 << 2) | \2 ; duration, tracks db \3 ; id endm - enum anim_cry_command ; e1 + enum anim_cry_command ; $e1 anim_cry: macro db anim_cry_command db \1 ; pitch endm - enum anim_minimizeopp_command ; e2 + enum anim_minimizeopp_command ; $e2 anim_minimizeopp: macro db anim_minimizeopp_command endm - enum anim_oamon_command ; e3 + enum anim_oamon_command ; $e3 anim_oamon: macro db anim_oamon_command endm - enum anim_oamoff_command ; e4 + enum anim_oamoff_command ; $e4 anim_oamoff: macro db anim_oamoff_command endm - enum anim_clearobjs_command ; e5 + enum anim_clearobjs_command ; $e5 anim_clearobjs: macro db anim_clearobjs_command endm - enum anim_beatup_command ; e6 + enum anim_beatup_command ; $e6 anim_beatup: macro db anim_beatup_command endm - enum anim_0xe7_command ; e7 + enum anim_0xe7_command ; $e7 anim_0xe7: macro db anim_0xe7_command endm - enum anim_updateactorpic_command ; e8 + enum anim_updateactorpic_command ; $e8 anim_updateactorpic: macro db anim_updateactorpic_command endm - enum anim_minimize_command ; e9 + enum anim_minimize_command ; $e9 anim_minimize: macro db anim_minimize_command endm - enum anim_0xea_command ; ea + enum anim_0xea_command ; $ea anim_0xea: macro db anim_0xea_command endm - enum anim_0xeb_command ; eb + enum anim_0xeb_command ; $eb anim_0xeb: macro db anim_0xeb_command endm - enum anim_0xec_command ; ec + enum anim_0xec_command ; $ec anim_0xec: macro db anim_0xec_command endm - enum anim_0xed_command ; ed + enum anim_0xed_command ; $ed anim_0xed: macro db anim_0xed_command endm - enum anim_if_param_and_command ; ee + enum anim_if_param_and_command ; $ee anim_if_param_and: macro db anim_if_param_and_command db \1 ; value dw \2 ; address endm - enum anim_jumpuntil_command ; ef + enum anim_jumpuntil_command ; $ef anim_jumpuntil: macro db anim_jumpuntil_command dw \1 ; address endm - enum anim_bgeffect_command ; f0 + enum anim_bgeffect_command ; $f0 anim_bgeffect: macro db anim_bgeffect_command db \1 ; effect @@ -206,89 +206,89 @@ anim_bgeffect: macro db \4 ; unknown endm - enum anim_bgp_command ; f1 + enum anim_bgp_command ; $f1 anim_bgp: macro db anim_bgp_command db \1 ; colors endm - enum anim_obp0_command ; f2 + enum anim_obp0_command ; $f2 anim_obp0: macro db anim_obp0_command db \1 ; colors endm - enum anim_obp1_command ; f3 + enum anim_obp1_command ; $f3 anim_obp1: macro db anim_obp1_command db \1 ; colors endm - enum anim_clearsprites_command ; f4 + enum anim_clearsprites_command ; $f4 anim_clearsprites: macro db anim_clearsprites_command endm - enum anim_0xf5_command ; f5 + enum anim_0xf5_command ; $f5 anim_0xf5: macro db anim_0xf5_command endm - enum anim_0xf6_command ; f6 + enum anim_0xf6_command ; $f6 anim_0xf6: macro db anim_0xf6_command endm - enum anim_0xf7_command ; f7 + enum anim_0xf7_command ; $f7 anim_0xf7: macro db anim_0xf7_command endm - enum anim_if_param_equal_command ; f8 + enum anim_if_param_equal_command ; $f8 anim_if_param_equal: macro db anim_if_param_equal_command db \1 ; value dw \2 ; address endm - enum anim_setvar_command ; f9 + enum anim_setvar_command ; $f9 anim_setvar: macro db anim_setvar_command db \1 ; value endm - enum anim_incvar_command ; fa + enum anim_incvar_command ; $fa anim_incvar: macro db anim_incvar_command endm - enum anim_if_var_equal_command ; fb + enum anim_if_var_equal_command ; $fb anim_if_var_equal: macro db anim_if_var_equal_command db \1 ; value dw \2 ; address endm - enum anim_jump_command ; fc + enum anim_jump_command ; $fc anim_jump: macro db anim_jump_command dw \1 ; address endm - enum anim_loop_command ; fd + enum anim_loop_command ; $fd anim_loop: macro db anim_loop_command db \1 ; count dw \2 ; address endm - enum anim_call_command ; fe + enum anim_call_command ; $fe anim_call: macro db anim_call_command dw \1 ; address endm - enum anim_ret_command ; ff + enum anim_ret_command ; $ff anim_ret: macro db anim_ret_command endm diff --git a/macros/scripts/movement.asm b/macros/scripts/movement.asm new file mode 100644 index 000000000..28be559a3 --- /dev/null +++ b/macros/scripts/movement.asm @@ -0,0 +1,246 @@ +; MovementPointers indexes (see engine/movement.asm) + enum_start + +; Directional movements + + enum movement_turn_head ; $00 +turn_head: macro + db movement_turn_head | \1 + endm + +__enum__ = __enum__ + 3 + + enum movement_turn_step ; $04 +turn_step: macro + db movement_turn_step | \1 + endm + +__enum__ = __enum__ + 3 + + enum movement_slow_step ; $08 +slow_step: macro + db movement_slow_step | \1 + endm + +__enum__ = __enum__ + 3 + + enum movement_step ; $0c +step: macro + db movement_step | \1 + endm + +__enum__ = __enum__ + 3 + + enum movement_big_step ; $10 +big_step: macro + db movement_big_step | \1 + endm + +__enum__ = __enum__ + 3 + + enum movement_slow_slide_step ; $14 +slow_slide_step: macro + db movement_slow_slide_step | \1 + endm + +__enum__ = __enum__ + 3 + + enum movement_slide_step ; $18 +slide_step: macro + db movement_slide_step | \1 + endm + +__enum__ = __enum__ + 3 + + enum movement_fast_slide_step ; $1c +fast_slide_step: macro + db movement_fast_slide_step | \1 + endm + +__enum__ = __enum__ + 3 + + enum movement_turn_away ; $20 +turn_away: macro + db movement_turn_away | \1 + endm + +__enum__ = __enum__ + 3 + + enum movement_turn_in ; $24 +turn_in: macro + db movement_turn_in | \1 + endm + +__enum__ = __enum__ + 3 + + enum movement_turn_waterfall ; $28 +turn_waterfall: macro + db movement_turn_waterfall | \1 + endm + +__enum__ = __enum__ + 3 + + enum movement_slow_jump_step ; $2c +slow_jump_step: macro + db movement_slow_jump_step | \1 + endm + +__enum__ = __enum__ + 3 + + enum movement_jump_step ; $30 +jump_step: macro + db movement_jump_step | \1 + endm + +__enum__ = __enum__ + 3 + + enum movement_fast_jump_step ; $34 +fast_jump_step: macro + db movement_fast_jump_step | \1 + endm + +__enum__ = __enum__ + 3 + +; Control + enum movement_remove_sliding ; $38 +remove_sliding: macro + db movement_remove_sliding + endm + + enum movement_set_sliding ; $39 +set_sliding: macro + db movement_set_sliding + endm + + enum movement_remove_fixed_facing ; $3a +remove_fixed_facing: macro + db movement_remove_fixed_facing + endm + + enum movement_fix_facing ; $3b +fix_facing: macro + db movement_fix_facing + endm + + enum movement_show_person ; $3c +show_person: macro + db movement_show_person + endm + + enum movement_hide_person ; $3d +hide_person: macro + db movement_hide_person + endm + +; Sleep + + enum movement_step_sleep ; $3e +step_sleep: macro +if \1 <= 8 + db movement_step_sleep + \1 - 1 +else + db movement_step_sleep + 8, \1 +endc +endm + +__enum__ = __enum__ + 8 + + enum movement_step_end ; $47 +step_end: macro + db movement_step_end + endm + + enum movement_step_48 ; $48 +step_48: macro + db movement_step_48 + db \1 ; ??? + endm + + enum movement_remove_person ; $49 +remove_person: macro + db movement_remove_person + endm + + enum movement_step_loop ; $4a +step_loop: macro + db movement_step_loop + endm + + enum movement_step_4b ; $4b +step_4b: macro + db movement_step_4b + endm + + enum movement_teleport_from ; $4c +teleport_from: macro + db movement_teleport_from + endm + + enum movement_teleport_to ; $4d +teleport_to: macro + db movement_teleport_to + endm + + enum movement_skyfall ; $4e +skyfall: macro + db movement_skyfall + endm + + enum movement_step_dig ; $4f +step_dig: macro + db movement_step_dig + db \1 ; length + endm + + enum movement_step_bump ; $50 +step_bump: macro + db movement_step_bump + endm + + enum movement_fish_got_bite ; $51 +fish_got_bite: macro + db movement_fish_got_bite + endm + + enum movement_fish_cast_rod ; $52 +fish_cast_rod: macro + db movement_fish_cast_rod + endm + + enum movement_hide_emote ; $53 +hide_emote: macro + db movement_hide_emote + endm + + enum movement_show_emote ; $54 +show_emote: macro + db movement_show_emote + endm + + enum movement_step_shake ; $55 +step_shake: macro + db movement_step_shake + db \1 ; displacement + endm + + enum movement_tree_shake ; $56 +tree_shake: macro + db movement_tree_shake + endm + + enum movement_rock_smash ; $57 +rock_smash: macro + db movement_rock_smash + db \1 ; length + endm + + enum movement_return_dig ; $58 +return_dig: macro + db movement_return_dig + db \1 ; length + endm + + enum movement_skyfall_top ; $59 +skyfall_top: macro + db movement_skyfall_top + endm diff --git a/macros/text.asm b/macros/scripts/text.asm similarity index 53% rename from macros/text.asm rename to macros/scripts/text.asm index e29f8a511..839f78eb7 100644 --- a/macros/text.asm +++ b/macros/scripts/text.asm @@ -1,131 +1,131 @@ -text EQUS "db $00," ; Start writing text. -next EQUS "db $4e," ; Move a line down. -line EQUS "db $4f," ; Start writing at the bottom line. -page EQUS "db $50," ; Start a new Pokédex page. -para EQUS "db $51," ; Start a new paragraph. -cont EQUS "db $55," ; Scroll to the next line. -done EQUS "db $57" ; End a text box. -prompt EQUS "db $58" ; Prompt the player to end a text box (initiating some other event). +text EQUS "db \"\"," ; Start writing text. +next EQUS "db \"\"," ; Move a line down. +line EQUS "db \"\"," ; Start writing at the bottom line. +page EQUS "db \"@\"," ; Start a new Pokédex page. +para EQUS "db \"\"," ; Start a new paragraph. +cont EQUS "db \"\"," ; Scroll to the next line. +done EQUS "db \"\"" ; End a text box. +prompt EQUS "db \"\"" ; Prompt the player to end a text box (initiating some other event). ; TextCommands indexes (see home/text.asm) enum_start $01 - enum TX_RAM + enum TX_RAM ; $01 text_from_ram: MACRO db TX_RAM dw \1 ENDM - enum TX_BCD + enum TX_BCD ; $02 text_bcd: macro db TX_BCD dw \1 db \2 ENDM - enum TX_MOVE + enum TX_MOVE ; $03 text_move: macro db TX_MOVE dw \1 ENDM - enum TX_BOX + enum TX_BOX ; $04 text_box: macro db TX_BOX dw \1 db \2, \3 ENDM - enum TX_LOW + enum TX_LOW ; $05 text_low: macro db TX_LOW endm - enum WAIT_BUTTON + enum WAIT_BUTTON ; $06 text_waitbutton: macro db WAIT_BUTTON endm - enum TX_SCROLL + enum TX_SCROLL ; $07 text_scroll: macro db TX_SCROLL endm - enum START_ASM + enum START_ASM ; $08 start_asm: macro db START_ASM endm - enum TX_NUM + enum TX_NUM ; $09 deciram: macro db TX_NUM dw \1 ; address dn \2, \3 ; bytes, digits endm - enum TX_EXIT + enum TX_EXIT ; $0a interpret_data: macro db TX_EXIT endm - enum TX_SOUND_0B + enum TX_SOUND_0B ; $0b sound_dex_fanfare_50_79: macro db TX_SOUND_0B endm - enum TX_DOTS + enum TX_DOTS ; $0c limited_interpret_data: macro db TX_DOTS db \1 endm - enum TX_LINK_WAIT_BUTTON + enum TX_LINK_WAIT_BUTTON ; $0d link_wait_button: macro db TX_LINK_WAIT_BUTTON endm - enum TX_SOUND_0E + enum TX_SOUND_0E ; $0e sound_dex_fanfare_20_49: macro db TX_SOUND_0E endm - enum TX_SOUND_0F + enum TX_SOUND_0F ; $0f sound_item: macro db TX_SOUND_0F endm - enum TX_SOUND_10 + enum TX_SOUND_10 ; $10 sound_caught_mon: macro db TX_SOUND_10 endm - enum TX_SOUND_11 + enum TX_SOUND_11 ; $11 sound_dex_fanfare_80_109: macro db TX_SOUND_11 endm - enum TX_SOUND_12 + enum TX_SOUND_12 ; $12 sound_fanfare: macro db TX_SOUND_12 endm - enum TX_SOUND_13 + enum TX_SOUND_13 ; $13 sound_slot_machine_start: macro db TX_SOUND_13 endm - enum TX_STRINGBUFFER + enum TX_STRINGBUFFER ; $14 text_buffer: macro db TX_STRINGBUFFER db \1 endm - enum TX_DAY + enum TX_DAY ; $15 current_day: macro db TX_DAY endm - enum TX_FAR + enum TX_FAR ; $16 text_jump: MACRO db TX_FAR dw \1 diff --git a/macros/scripts/trade_anim.asm b/macros/scripts/trade_anim.asm new file mode 100644 index 000000000..4b0291eea --- /dev/null +++ b/macros/scripts/trade_anim.asm @@ -0,0 +1,255 @@ +; DoTradeAnimation.JumpTable indexes (see engine/trade/animation.asm) + enum_start + + enum tradeanim_next_command ; $00 +tradeanim_next: macro + db tradeanim_next_command +endm + + enum tradeanim_show_givemon_data_command ; $01 +tradeanim_show_givemon_data: macro + db tradeanim_show_givemon_data_command +endm + + enum tradeanim_show_getmon_data_command ; $02 +tradeanim_show_getmon_data: macro + db tradeanim_show_getmon_data_command +endm + + enum tradeanim_enter_link_tube_command ; $03 +tradeanim_enter_link_tube: macro + db tradeanim_enter_link_tube_command +endm + +__enum__ set $5 + + enum tradeanim_exit_link_tube_command ; $05 +tradeanim_exit_link_tube: macro + db tradeanim_exit_link_tube_command +endm + + enum tradeanim_tube_to_ot_command ; $06 +tradeanim_tube_to_ot: macro + db tradeanim_tube_to_ot_command +endm + +__enum__ set $0e + + enum tradeanim_tube_to_player_command ; $0e +tradeanim_tube_to_player: macro + db tradeanim_tube_to_player_command +endm + +__enum__ set $16 + + enum tradeanim_sent_to_ot_text_command ; $16 +tradeanim_sent_to_ot_text: macro + db tradeanim_sent_to_ot_text_command +endm + + enum tradeanim_ot_bids_farewell_command ; $17 +tradeanim_ot_bids_farewell: macro + db tradeanim_ot_bids_farewell_command +endm + + enum tradeanim_take_care_of_text_command ; $18 +tradeanim_take_care_of_text: macro + db tradeanim_take_care_of_text_command +endm + + enum tradeanim_ot_sends_text_1_command ; $19 +tradeanim_ot_sends_text_1: macro + db tradeanim_ot_sends_text_1_command +endm + + enum tradeanim_ot_sends_text_2_command ; $1a +tradeanim_ot_sends_text_2: macro + db tradeanim_ot_sends_text_2_command +endm + + enum tradeanim_setup_givemon_scroll_command ; $1b +tradeanim_setup_givemon_scroll: macro + db tradeanim_setup_givemon_scroll_command +endm + + enum tradeanim_do_givemon_scroll_command ; $1c +tradeanim_do_givemon_scroll: macro + db tradeanim_do_givemon_scroll_command +endm + + enum tradeanim_frontpic_scroll_command ; $1d +tradeanim_frontpic_scroll: macro + db tradeanim_frontpic_scroll_command +endm + + enum tradeanim_textbox_scroll_command ; $1e +tradeanim_textbox_scroll: macro + db tradeanim_textbox_scroll_command +endm + + enum tradeanim_scroll_out_right_command ; $1f +tradeanim_scroll_out_right: macro + db tradeanim_scroll_out_right_command +endm + +__enum__ set $21 + + enum tradeanim_wait_80_command ; $21 +tradeanim_wait_80: macro + db tradeanim_wait_80_command +endm + + enum tradeanim_wait_40_command ; $22 +tradeanim_wait_40: macro + db tradeanim_wait_40_command +endm + + enum tradeanim_rocking_ball_command ; $23 +tradeanim_rocking_ball: macro + db tradeanim_rocking_ball_command +endm + + enum tradeanim_drop_ball_command ; $24 +tradeanim_drop_ball: macro + db tradeanim_drop_ball_command +endm + + enum tradeanim_wait_anim_command ; $25 +tradeanim_wait_anim: macro + db tradeanim_wait_anim_command +endm + +__enum__ set $27 + + enum tradeanim_poof_command ; $27 +tradeanim_poof: macro + db tradeanim_poof_command +endm + + enum tradeanim_bulge_through_tube_command ; $28 +tradeanim_bulge_through_tube: macro + db tradeanim_bulge_through_tube_command +endm + + enum tradeanim_give_trademon_sfx_command ; $29 +tradeanim_give_trademon_sfx: macro + db tradeanim_give_trademon_sfx_command +endm + + enum tradeanim_get_trademon_sfx_command ; $2a +tradeanim_get_trademon_sfx: macro + db tradeanim_get_trademon_sfx_command +endm + + enum tradeanim_end_command ; $2b +tradeanim_end: macro + db tradeanim_end_command +endm + + enum tradeanim_animate_frontpic_command ; $2c +tradeanim_animate_frontpic: macro + db tradeanim_animate_frontpic_command +endm + + enum tradeanim_wait_96_command ; $2d +tradeanim_wait_96: macro + db tradeanim_wait_96_command +endm + + enum tradeanim_wait_80_if_ot_egg_command ; $2e +tradeanim_wait_80_if_ot_egg: macro + db tradeanim_wait_80_if_ot_egg_command +endm + + enum tradeanim_wait_180_if_ot_egg_command ; $2f +tradeanim_wait_180_if_ot_egg: macro + db tradeanim_wait_180_if_ot_egg_command +endm + + +; Mobile + enum_start $01 + + enum mobiletradeanim_showgivemon_command ; $01 +mobiletradeanim_showgivemon: macro + db mobiletradeanim_showgivemon_command +endm + + enum mobiletradeanim_02_command ; $02 +mobiletradeanim_02: macro + db mobiletradeanim_02_command +endm + + enum mobiletradeanim_sendmon_command ; $03 +mobiletradeanim_sendmon: macro + db mobiletradeanim_sendmon_command +endm + +__enum__ set $05 + + enum mobiletradeanim_05_command ; $05 +mobiletradeanim_05: macro + db mobiletradeanim_05_command +endm + + enum mobiletradeanim_06_command ; $06 +mobiletradeanim_06: macro + db mobiletradeanim_06_command +endm + + enum mobiletradeanim_07_command ; $07 +mobiletradeanim_07: macro + db mobiletradeanim_07_command +endm + + enum mobiletradeanim_receivemon_command ; $08 +mobiletradeanim_receivemon: macro + db mobiletradeanim_receivemon_command +endm + +__enum__ set $0b + + enum mobiletradeanim_showgetmon_command ; $0b +mobiletradeanim_showgetmon: macro + db mobiletradeanim_showgetmon_command +endm + + enum mobiletradeanim_end_command ; $0c +mobiletradeanim_end: macro + db mobiletradeanim_end_command +endm + + enum mobiletradeanim_showgtsgivemon_command ; $0d +mobiletradeanim_showgtsgivemon: macro + db mobiletradeanim_showgtsgivemon_command +endm + + enum mobiletradeanim_showgtsgetmon_command ; $0e +mobiletradeanim_showgtsgetmon: macro + db mobiletradeanim_showgtsgetmon_command +endm + + enum mobiletradeanim_0f_command ; $0f +mobiletradeanim_0f: macro + db mobiletradeanim_0f_command +endm + + enum mobiletradeanim_10_command ; $10 +mobiletradeanim_10: macro + db mobiletradeanim_10_command +endm + + enum mobiletradeanim_11_command ; $11 +mobiletradeanim_11: macro + db mobiletradeanim_11_command +endm + + enum mobiletradeanim_12_command ; $12 +mobiletradeanim_12: macro + db mobiletradeanim_12_command +endm + + enum mobiletradeanim_showoddegg_command ; $13 +mobiletradeanim_showoddegg: macro + db mobiletradeanim_showoddegg_command +endm diff --git a/macros/tilesets.asm b/macros/tilesets.asm index 6a233254e..aeb1d8174 100755 --- a/macros/tilesets.asm +++ b/macros/tilesets.asm @@ -1,3 +1,5 @@ +; Used in tilesets/*.asm + tilepal: MACRO ; vram bank, pals x = \1 << OAM_TILE_BANK diff --git a/macros/trade_anim.asm b/macros/trade_anim.asm deleted file mode 100755 index c38dc75d6..000000000 --- a/macros/trade_anim.asm +++ /dev/null @@ -1,255 +0,0 @@ -; DoTradeAnimation.JumpTable indexes (see engine/trade/animation.asm) - enum_start - - enum tradeanim_next_command -tradeanim_next: macro - db tradeanim_next_command ; 00 -endm - - enum tradeanim_show_givemon_data_command -tradeanim_show_givemon_data: macro - db tradeanim_show_givemon_data_command ; 01 -endm - - enum tradeanim_show_getmon_data_command -tradeanim_show_getmon_data: macro - db tradeanim_show_getmon_data_command ; 02 -endm - - enum tradeanim_enter_link_tube_command -tradeanim_enter_link_tube: macro - db tradeanim_enter_link_tube_command ; 03 -endm - -__enum__ set $5 - - enum tradeanim_exit_link_tube_command -tradeanim_exit_link_tube: macro - db tradeanim_exit_link_tube_command ; 05 -endm - - enum tradeanim_tube_to_ot_command -tradeanim_tube_to_ot: macro - db tradeanim_tube_to_ot_command ; 06 -endm - -__enum__ set $e - - enum tradeanim_tube_to_player_command -tradeanim_tube_to_player: macro - db tradeanim_tube_to_player_command ; 0e -endm - -__enum__ set $16 - - enum tradeanim_sent_to_ot_text_command -tradeanim_sent_to_ot_text: macro - db tradeanim_sent_to_ot_text_command ; 16 -endm - - enum tradeanim_ot_bids_farewell_command -tradeanim_ot_bids_farewell: macro - db tradeanim_ot_bids_farewell_command ; 17 -endm - - enum tradeanim_take_care_of_text_command -tradeanim_take_care_of_text: macro - db tradeanim_take_care_of_text_command ; 18 -endm - - enum tradeanim_ot_sends_text_1_command -tradeanim_ot_sends_text_1: macro - db tradeanim_ot_sends_text_1_command ; 19 -endm - - enum tradeanim_ot_sends_text_2_command -tradeanim_ot_sends_text_2: macro - db tradeanim_ot_sends_text_2_command ; 1a -endm - - enum tradeanim_setup_givemon_scroll_command -tradeanim_setup_givemon_scroll: macro - db tradeanim_setup_givemon_scroll_command ; 1b -endm - - enum tradeanim_do_givemon_scroll_command -tradeanim_do_givemon_scroll: macro - db tradeanim_do_givemon_scroll_command ; 1c -endm - - enum tradeanim_frontpic_scroll_command -tradeanim_frontpic_scroll: macro - db tradeanim_frontpic_scroll_command ; 1d -endm - - enum tradeanim_textbox_scroll_command -tradeanim_textbox_scroll: macro - db tradeanim_textbox_scroll_command ; 1e -endm - - enum tradeanim_scroll_out_right_command -tradeanim_scroll_out_right: macro - db tradeanim_scroll_out_right_command ; 1f -endm - -__enum__ set $21 - - enum tradeanim_wait_80_command -tradeanim_wait_80: macro - db tradeanim_wait_80_command ; 21 -endm - - enum tradeanim_wait_40_command -tradeanim_wait_40: macro - db tradeanim_wait_40_command ; 22 -endm - - enum tradeanim_rocking_ball_command -tradeanim_rocking_ball: macro - db tradeanim_rocking_ball_command ; 23 -endm - - enum tradeanim_drop_ball_command -tradeanim_drop_ball: macro - db tradeanim_drop_ball_command ; 24 -endm - - enum tradeanim_wait_anim_command -tradeanim_wait_anim: macro - db tradeanim_wait_anim_command ; 25 -endm - -__enum__ set $27 - - enum tradeanim_poof_command -tradeanim_poof: macro - db tradeanim_poof_command ; 27 -endm - - enum tradeanim_bulge_through_tube_command -tradeanim_bulge_through_tube: macro - db tradeanim_bulge_through_tube_command ; 28 -endm - - enum tradeanim_give_trademon_sfx_command -tradeanim_give_trademon_sfx: macro - db tradeanim_give_trademon_sfx_command ; 29 -endm - - enum tradeanim_get_trademon_sfx_command -tradeanim_get_trademon_sfx: macro - db tradeanim_get_trademon_sfx_command ; 2a -endm - - enum tradeanim_end_command -tradeanim_end: macro - db tradeanim_end_command ; 2b -endm - - enum tradeanim_animate_frontpic_command -tradeanim_animate_frontpic: macro - db tradeanim_animate_frontpic_command ; 2c -endm - - enum tradeanim_wait_96_command -tradeanim_wait_96: macro - db tradeanim_wait_96_command ; 2d -endm - - enum tradeanim_wait_80_if_ot_egg_command -tradeanim_wait_80_if_ot_egg: macro - db tradeanim_wait_80_if_ot_egg_command ; 2e -endm - - enum tradeanim_wait_180_if_ot_egg_command -tradeanim_wait_180_if_ot_egg: macro - db tradeanim_wait_180_if_ot_egg_command ; 2f -endm - - -; Mobile - enum_start 1 - - enum mobiletradeanim_showgivemon_command -mobiletradeanim_showgivemon: macro - db mobiletradeanim_showgivemon_command ; 01 -endm - - enum mobiletradeanim_02_command -mobiletradeanim_02: macro - db mobiletradeanim_02_command ; 02 -endm - - enum mobiletradeanim_sendmon_command -mobiletradeanim_sendmon: macro - db mobiletradeanim_sendmon_command ; 03 -endm - -__enum__ set $05 - - enum mobiletradeanim_05_command -mobiletradeanim_05: macro - db mobiletradeanim_05_command ; 05 -endm - - enum mobiletradeanim_06_command -mobiletradeanim_06: macro - db mobiletradeanim_06_command ; 06 -endm - - enum mobiletradeanim_07_command -mobiletradeanim_07: macro - db mobiletradeanim_07_command ; 07 -endm - - enum mobiletradeanim_receivemon_command -mobiletradeanim_receivemon: macro - db mobiletradeanim_receivemon_command ; 08 -endm - -__enum__ set $0b - - enum mobiletradeanim_showgetmon_command -mobiletradeanim_showgetmon: macro - db mobiletradeanim_showgetmon_command ; 0b -endm - - enum mobiletradeanim_end_command -mobiletradeanim_end: macro - db mobiletradeanim_end_command ; 0c -endm - - enum mobiletradeanim_showgtsgivemon_command -mobiletradeanim_showgtsgivemon: macro - db mobiletradeanim_showgtsgivemon_command ; 0d -endm - - enum mobiletradeanim_showgtsgetmon_command -mobiletradeanim_showgtsgetmon: macro - db mobiletradeanim_showgtsgetmon_command ; 0e -endm - - enum mobiletradeanim_0f_command -mobiletradeanim_0f: macro - db mobiletradeanim_0f_command ; 0f -endm - - enum mobiletradeanim_10_command -mobiletradeanim_10: macro - db mobiletradeanim_10_command ; 10 -endm - - enum mobiletradeanim_11_command -mobiletradeanim_11: macro - db mobiletradeanim_11_command ; 11 -endm - - enum mobiletradeanim_12_command -mobiletradeanim_12: macro - db mobiletradeanim_12_command ; 12 -endm - - enum mobiletradeanim_showoddegg_command -mobiletradeanim_showoddegg: macro - db mobiletradeanim_showoddegg_command ; 13 -endm diff --git a/macros/trainer.asm b/macros/trainer.asm deleted file mode 100644 index 2e6c61884..000000000 --- a/macros/trainer.asm +++ /dev/null @@ -1,11 +0,0 @@ -trainerclass: MACRO - enum \1 -const_value = 1 -ENDM - -trainer: MACRO - ; flag, group, id, seen text, win text, lost text, talk-again text - dw \1 - db \2, \3 - dw \4, \5, \6, \7 -ENDM diff --git a/macros/wram.asm b/macros/wram.asm index ce53dc5c7..7cead9158 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -1,3 +1,4 @@ +; Used in wram.asm flag_array: MACRO ds ((\1) + 7) / 8 @@ -15,7 +16,7 @@ box_struct: MACRO \1DefExp:: dw \1SpdExp:: dw \1SpcExp:: dw -\1DVs:: ds 2 +\1DVs:: dw \1PP:: ds NUM_MOVES \1Happiness:: db \1PokerusStatus:: db @@ -60,7 +61,7 @@ red_box_struct: MACRO \1DefenseExp:: dw \1SpeedExp:: dw \1SpecialExp:: dw -\1DVs:: ds 2 +\1DVs:: dw \1PP:: ds NUM_MOVES ENDM @@ -81,7 +82,7 @@ battle_struct: MACRO \1Item:: db \1Moves:: ds NUM_MOVES \1MovesEnd:: -\1DVs:: ds 2 +\1DVs:: dw \1PP:: ds NUM_MOVES \1Happiness:: db \1Level:: db @@ -103,7 +104,7 @@ ENDM box: MACRO \1:: -\1Count:: ds 1 +\1Count:: db \1Species:: ds MONS_PER_BOX + 1 \1Mons:: \1Mon1:: box_struct \1Mon1 @@ -115,6 +116,18 @@ box: MACRO ENDM +map_connection_struct: MACRO +\1ConnectedMapGroup:: db +\1ConnectedMapNumber:: db +\1ConnectionStripPointer:: dw +\1ConnectionStripLocation:: dw +\1ConnectionStripLength:: db +\1ConnectedMapWidth:: db +\1ConnectionStripYOffset:: db +\1ConnectionStripXOffset:: db +\1ConnectionWindow:: dw +ENDM + channel_struct: MACRO ; Addreses are Channel1 (c101). \1MusicID:: dw @@ -134,14 +147,14 @@ channel_struct: MACRO \1FrequencyHi:: db \1Pitch:: db ; 0:rest 1-c:note \1Octave:: db ; 7-0 (0 is highest) -\1PitchOffset:: db ; raises existing octaves (to repeat phrases) +\1PitchOffset:: db ; raises existing octaves (to repeat phrases) \1NoteDuration:: db ; frames remaining for the current note \1Field0x16:: ds 1 ; c117 ds 1 ; c118 \1LoopCount:: db \1Tempo:: dw \1Tracks:: db ; hi:left lo:right -\1SFXDutyLoop:: ds 1 ; c11d +\1SFXDutyLoop:: db ; c11d \1VibratoDelayCount:: db ; initialized by \1VibratoDelay \1VibratoDelay:: db ; number of frames a note plays until vibrato starts \1VibratoExtent:: db @@ -149,7 +162,7 @@ channel_struct: MACRO \1PitchWheelTarget:: dw ; frequency endpoint for pitch wheel \1PitchWheelAmount:: db ; c124 \1PitchWheelAmountFraction:: db ; c125 -\1Field0x25:: ds 1 ; c126 +\1Field0x25:: db ; c126 ds 1 ; c127 \1CryPitch:: dw \1Field0x29:: ds 1 @@ -179,22 +192,13 @@ battle_tower_struct: MACRO endm mailmsg: MACRO -\1Message:: ds MAIL_MSG_LENGTH +\1Message:: ds MAIL_MSG_LENGTH \1MessageEnd:: ds 1 -\1Author:: ds PLAYER_NAME_LENGTH +\1Author:: ds PLAYER_NAME_LENGTH \1AuthorNationality:: ds 2 -\1AuthorID:: ds 2 -\1Species:: ds 1 -\1Type:: ds 1 -\1End:: -endm - -hof_mon: MACRO -\1Species:: ds 1 -\1ID:: ds 2 -\1DVs:: ds 2 -\1Level:: ds 1 -\1Nickname:: ds PKMN_NAME_LENGTH +- 1 +\1AuthorID:: dw +\1Species:: db +\1Type:: db \1End:: endm @@ -203,19 +207,27 @@ roam_struct: MACRO \1Level:: db \1MapGroup:: db \1MapNumber:: db -\1HP:: ds 1 -\1DVs:: ds 2 +\1HP:: db +\1DVs:: dw ENDM bugcontestwinner: macro -\1PersonID:: ds 1 -\1Mon:: ds 1 -\1Score:: ds 2 +\1PersonID:: db +\1Mon:: db +\1Score:: dw +endm + +hof_mon: MACRO +\1Species:: db +\1ID:: dw +\1DVs:: dw +\1Level:: db +\1Nickname:: ds PKMN_NAME_LENGTH +- 1 +\1End:: endm hall_of_fame: MACRO -\1:: -\1WinCount:: ds 1 +\1WinCount:: db \1Mon1:: hof_mon \1Mon1 \1Mon2:: hof_mon \1Mon2 \1Mon3:: hof_mon \1Mon3 @@ -225,26 +237,34 @@ hall_of_fame: MACRO \1End:: ds 1 ENDM +link_battle_record: MACRO +\1Name:: ds NAME_LENGTH +- 1 +\1ID:: dw +\1Wins:: dw +\1Losses:: dw +\1Draws:: dw +ENDM + trademon: MACRO -\1Species:: ds 1 ; wc6d0 | wc702 +\1Species:: db ; wc6d0 | wc702 \1SpeciesName:: ds PKMN_NAME_LENGTH ; wc6d1 | wc703 -\1Nickname:: ds PKMN_NAME_LENGTH ; wc6dc | wc70e -\1SenderName:: ds NAME_LENGTH ; wc6e7 | wc719 -\1OTName:: ds NAME_LENGTH ; wc6f2 | wc724 -\1DVs:: ds 2 ; wc6fd | wc72f -\1ID:: ds 2 ; wc6ff | wc731 -\1CaughtData:: ds 1 ; wc701 | wc733 +\1Nickname:: ds PKMN_NAME_LENGTH ; wc6dc | wc70e +\1SenderName:: ds NAME_LENGTH ; wc6e7 | wc719 +\1OTName:: ds NAME_LENGTH ; wc6f2 | wc724 +\1DVs:: dw ; wc6fd | wc72f +\1ID:: dw ; wc6ff | wc731 +\1CaughtData:: db ; wc701 | wc733 \1End:: ENDM move_struct: MACRO -\1Animation:: ds 1 -\1Effect:: ds 1 -\1Power:: ds 1 -\1Type:: ds 1 -\1Accuracy:: ds 1 -\1PP:: ds 1 -\1EffectChance:: ds 1 +\1Animation:: db +\1Effect:: db +\1Power:: db +\1Type:: db +\1Accuracy:: db +\1PP:: db +\1EffectChance:: db endm slot_reel: MACRO @@ -266,109 +286,109 @@ endm object_struct: MACRO \1Struct:: -\1Sprite:: ds 1 -\1MapObjectIndex:: ds 1 -\1SpriteTile:: ds 1 -\1MovementType:: ds 1 -\1Flags:: ds 2 -\1Palette:: ds 1 -\1Walking:: ds 1 -\1Direction:: ds 1 -\1StepType:: ds 1 -\1StepDuration:: ds 1 -\1Action:: ds 1 -\1ObjectStepFrame:: ds 1 -\1Facing:: ds 1 -\1StandingTile:: ds 1 ; collision -\1LastTile:: ds 1 ; collision -\1StandingMapX:: ds 1 -\1StandingMapY:: ds 1 -\1LastMapX:: ds 1 -\1LastMapY:: ds 1 -\1ObjectInitX:: ds 1 -\1ObjectInitY:: ds 1 -\1Radius:: ds 1 -\1SpriteX:: ds 1 -\1SpriteY:: ds 1 -\1SpriteXOffset:: ds 1 -\1SpriteYOffset:: ds 1 -\1MovementByteIndex:: ds 1 -\1Object28:: ds 1 -\1Object29:: ds 1 -\1Object30:: ds 1 -\1Object31:: ds 1 -\1Range:: ds 1 +\1Sprite:: db +\1MapObjectIndex:: db +\1SpriteTile:: db +\1MovementType:: db +\1Flags:: dw +\1Palette:: db +\1Walking:: db +\1Direction:: db +\1StepType:: db +\1StepDuration:: db +\1Action:: db +\1ObjectStepFrame:: db +\1Facing:: db +\1StandingTile:: db ; collision +\1LastTile:: db ; collision +\1StandingMapX:: db +\1StandingMapY:: db +\1LastMapX:: db +\1LastMapY:: db +\1ObjectInitX:: db +\1ObjectInitY:: db +\1Radius:: db +\1SpriteX:: db +\1SpriteY:: db +\1SpriteXOffset:: db +\1SpriteYOffset:: db +\1MovementByteIndex:: db +\1Object28:: ds 1 +\1Object29:: ds 1 +\1Object30:: ds 1 +\1Object31:: ds 1 +\1Range:: db ds 7 \1StructEnd:: ENDM map_object: MACRO \1Object:: -\1ObjectStructID:: ds 1 -\1ObjectSprite:: ds 1 -\1ObjectYCoord:: ds 1 -\1ObjectXCoord:: ds 1 -\1ObjectMovement:: ds 1 -\1ObjectRadius:: ds 1 -\1ObjectHour:: ds 1 -\1ObjectTimeOfDay:: ds 1 -\1ObjectColor:: ds 1 -\1ObjectRange:: ds 1 -\1ObjectScript:: ds 2 -\1ObjectEventFlag:: ds 2 +\1ObjectStructID:: db +\1ObjectSprite:: db +\1ObjectYCoord:: db +\1ObjectXCoord:: db +\1ObjectMovement:: db +\1ObjectRadius:: db +\1ObjectHour:: db +\1ObjectTimeOfDay:: db +\1ObjectColor:: db +\1ObjectRange:: db +\1ObjectScript:: dw +\1ObjectEventFlag:: dw ds 2 endm sprite_anim_struct: MACRO -\1Index:: ds 1 ; 0 -\1FramesetID:: ds 1 ; 1 -\1AnimSeqID:: ds 1 ; 2 -\1TileID:: ds 1 ; 3 -\1XCoord:: ds 1 ; 4 -\1YCoord:: ds 1 ; 5 -\1XOffset:: ds 1 ; 6 -\1YOffset:: ds 1 ; 7 -\1Duration:: ds 1 ; 8 -\1DurationOffset:: ds 1 ; 9 -\1FrameIndex:: ds 1 ; a -\1Sprite0b:: ds 1 -\1Sprite0c:: ds 1 -\1Sprite0d:: ds 1 -\1Sprite0e:: ds 1 -\1Sprite0f:: ds 1 +\1Index:: db +\1FramesetID:: db +\1AnimSeqID:: db +\1TileID:: db +\1XCoord:: db +\1YCoord:: db +\1XOffset:: db +\1YOffset:: db +\1Duration:: db +\1DurationOffset:: db +\1FrameIndex:: db +\1Sprite0b:: ds 1 +\1Sprite0c:: ds 1 +\1Sprite0d:: ds 1 +\1Sprite0e:: ds 1 +\1Sprite0f:: ds 1 ENDM battle_anim_struct: MACRO ; Placeholder until we can figure out what it all means -\1_Index:: ds 1 -\1_Anim01:: ds 1 -\1_Anim02:: ds 1 -\1_FramesetIndex:: ds 1 -\1_FunctionIndex:: ds 1 -\1_Anim05:: ds 1 -\1_TileID:: ds 1 -\1_XCoord:: ds 1 -\1_YCoord:: ds 1 -\1_XOffset:: ds 1 -\1_YOffset:: ds 1 -\1_Anim0b:: ds 1 -\1_Anim0c:: ds 1 -\1_Anim0d:: ds 1 -\1_AnonJumptableIndex:: ds 1 -\1_Anim0f:: ds 1 -\1_Anim10:: ds 1 -\1_Anim11:: ds 1 -\1_Anim12:: ds 1 -\1_Anim13:: ds 1 -\1_Anim14:: ds 1 -\1_Anim15:: ds 1 -\1_Anim16:: ds 1 -\1_Anim17:: ds 1 +\1_Index:: db +\1_Anim01:: ds 1 +\1_Anim02:: ds 1 +\1_FramesetIndex:: db +\1_FunctionIndex:: db +\1_Anim05:: ds 1 +\1_TileID:: db +\1_XCoord:: db +\1_YCoord:: db +\1_XOffset:: db +\1_YOffset:: db +\1_Anim0b:: ds 1 +\1_Anim0c:: ds 1 +\1_Anim0d:: ds 1 +\1_AnonJumptableIndex:: db +\1_Anim0f:: ds 1 +\1_Anim10:: ds 1 +\1_Anim11:: ds 1 +\1_Anim12:: ds 1 +\1_Anim13:: ds 1 +\1_Anim14:: ds 1 +\1_Anim15:: ds 1 +\1_Anim16:: ds 1 +\1_Anim17:: ds 1 endm battle_bg_effect: MACRO -\1_Function:: ds 1 -\1_01:: ds 1 -\1_02:: ds 1 -\1_03:: ds 1 +\1_Function:: db +\1_01:: ds 1 +\1_02:: ds 1 +\1_03:: ds 1 endm diff --git a/main.asm b/main.asm index cbfe27d2b..bc6e5f902 100644 --- a/main.asm +++ b/main.asm @@ -51,200 +51,16 @@ PushOAM: ; 403f PushOAMEnd INCLUDE "engine/map_objects.asm" - INCLUDE "engine/intro_menu.asm" - -ReanchorBGMap_NoOAMUpdate:: ; 6454 - call DelayFrame - ld a, [hOAMUpdate] - push af - - ld a, $1 - ld [hOAMUpdate], a - ld a, [hBGMapMode] - push af - xor a - ld [hBGMapMode], a - - call .ReanchorBGMap - - pop af - ld [hBGMapMode], a - pop af - ld [hOAMUpdate], a - ld hl, VramState - set 6, [hl] - ret - -.ReanchorBGMap: - xor a - ld [hLCDCPointer], a - ld [hBGMapMode], a - ld a, $90 - ld [hWY], a - call OverworldTextModeSwitch - ld a, VBGMap1 / $100 - call .LoadBGMapAddrIntoHRAM - call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap - callba LoadOW_BGPal7 - callba ApplyPals - ld a, $1 - ld [hCGBPalUpdate], a - xor a - ld [hBGMapMode], a - ld [hWY], a - callba HDMATransfer_FillBGMap0WithBlack ; no need to farcall - ld a, VBGMap0 / $100 - call .LoadBGMapAddrIntoHRAM - xor a - ld [wBGMapAnchor], a - ld a, VBGMap0 / $100 - ld [wBGMapAnchor + 1], a - xor a - ld [hSCX], a - ld [hSCY], a - call ApplyBGMapAnchorToObjects - ret - -.LoadBGMapAddrIntoHRAM: ; 64b9 - ld [hBGMapAddress + 1], a - xor a - ld [hBGMapAddress], a - ret - -LoadFonts_NoOAMUpdate:: ; 64bf - ld a, [hOAMUpdate] - push af - ld a, $1 - ld [hOAMUpdate], a - - call .LoadGFX - - pop af - ld [hOAMUpdate], a - ret - -.LoadGFX: - call LoadFontsExtra - ld a, $90 - ld [hWY], a - call SafeUpdateSprites - call LoadStandardFont - ret - -HDMATransfer_FillBGMap0WithBlack: ; 64db - ld a, [rSVBK] - push af - ld a, $6 - ld [rSVBK], a - - ld a, "" ; $60 - ld hl, wDecompressScratch - ld bc, wScratchAttrMap - wDecompressScratch - call ByteFill - ld a, wDecompressScratch / $100 - ld [rHDMA1], a - ld a, wDecompressScratch % $100 - ld [rHDMA2], a - ld a, (VBGMap0 % $8000) / $100 - ld [rHDMA3], a - ld a, (VBGMap0 % $8000) % $100 - ld [rHDMA4], a - ld a, $3f - ld [hDMATransfer], a - call DelayFrame - - pop af - ld [rSVBK], a - ret - +INCLUDE "engine/init_map.asm" INCLUDE "engine/learn.asm" - -CheckNickErrors:: ; 669f -; error-check monster nick before use -; must be a peace offering to gamesharkers - -; input: de = nick location - - push bc - push de - ld b, PKMN_NAME_LENGTH - -.checkchar -; end of nick? - ld a, [de] - cp "@" ; terminator - jr z, .end - -; check if this char is a text command - ld hl, .textcommands - dec hl -.loop -; next entry - inc hl -; reached end of commands table? - ld a, [hl] - cp -1 - jr z, .done - -; is the current char between this value (inclusive)... - ld a, [de] - cp [hl] - inc hl - jr c, .loop -; ...and this one? - cp [hl] - jr nc, .loop - -; replace it with a "?" - ld a, "?" - ld [de], a - jr .loop - -.done -; next char - inc de -; reached end of nick without finding a terminator? - dec b - jr nz, .checkchar - -; change nick to "?@" - pop de - push de - ld a, "?" - ld [de], a - inc de - ld a, "@" - ld [de], a -.end -; if the nick has any errors at this point it's out of our hands - pop de - pop bc - ret - -.textcommands ; 66cf -; table defining which characters are actually text commands -; format: - ; ≥ < - db "", $04 + 1 - db "", $18 + 1 - db $1d, "%" + 1 - db $35, "" + 1 - db "", "" + 1 - db $49, "" + 1 - db "", "┘" + 1 - db -1 ; end - +INCLUDE "engine/check_nick_errors.asm" INCLUDE "engine/math.asm" -INCLUDE "items/item_attributes.asm" +INCLUDE "data/items/item_attributes.asm" INCLUDE "engine/npc_movement.asm" INCLUDE "event/happiness_egg.asm" INCLUDE "event/special.asm" -Predef1: ; 747a -; not used - ret - SECTION "bank2", ROMX @@ -256,26 +72,7 @@ INCLUDE "engine/color.asm" SECTION "bank3", ROMX -CheckTime:: ; c000 - ld a, [TimeOfDay] - ld hl, TimeOfDayTable - ld de, 2 - call IsInArray - inc hl - ld c, [hl] - ret c - - xor a - ld c, a - ret - -TimeOfDayTable: ; c012 - db MORN_F, MORN - db DAY_F, DAY - db NITE_F, NITE - db NITE_F, NITE - db -1 - +INCLUDE "engine/check_time.asm" INCLUDE "engine/specials.asm" INCLUDE "engine/printnum.asm" INCLUDE "engine/health.asm" @@ -285,101 +82,10 @@ INCLUDE "engine/player_step.asm" INCLUDE "engine/anim_hp_bar.asm" INCLUDE "engine/move_mon.asm" INCLUDE "engine/billspctop.asm" - -GetBreedMon1LevelGrowth: ; e698 - ld hl, wBreedMon1Stats - ld de, TempMon - ld bc, BOXMON_STRUCT_LENGTH - call CopyBytes - callab CalcLevel - ld a, [wBreedMon1Level] - ld b, a - ld a, d - ld e, a - sub b - ld d, a - ret - -GetBreedMon2LevelGrowth: ; e6b3 - ld hl, wBreedMon2Stats - ld de, TempMon - ld bc, BOXMON_STRUCT_LENGTH - call CopyBytes - callab CalcLevel - ld a, [wBreedMon2Level] - ld b, a - ld a, d - ld e, a - sub b - ld d, a - ret - -BugContest_SetCaughtContestMon: ; e6ce - ld a, [wContestMon] - and a - jr z, .firstcatch - ld [wd265], a - callba DisplayAlreadyCaughtText - callba DisplayCaughtContestMonStats - lb bc, 14, 7 - call PlaceYesNoBox - ret c - -.firstcatch - call .generatestats - ld a, [TempEnemyMonSpecies] - ld [wd265], a - call GetPokemonName - ld hl, .caughttext - call PrintText - ret - -.generatestats ; e6fd - ld a, [TempEnemyMonSpecies] - ld [CurSpecies], a - ld [CurPartySpecies], a - call GetBaseData - xor a - ld bc, PARTYMON_STRUCT_LENGTH - ld hl, wContestMon - call ByteFill - xor a - ld [MonType], a - ld hl, wContestMon - jp GeneratePartyMonStats - -.caughttext ; 0xe71d - ; Caught @ ! - text_jump UnknownText_0x1c10c0 - db "@" - -INCLUDE "items/item_effects.asm" - -KnowsMove: ; f9ea - ld a, MON_MOVES - call GetPartyParamLocation - ld a, [wPutativeTMHMMove] - ld b, a - ld c, NUM_MOVES -.loop - ld a, [hli] - cp b - jr z, .knows_move - dec c - jr nz, .loop - and a - ret - -.knows_move - ld hl, .Text_knows - call PrintText - scf - ret - -.Text_knows: ; 0xfa06 - ; knows @ . - text_jump UnknownText_0x1c5ea8 - db "@" +INCLUDE "engine/get_breedmon_growth.asm" +INCLUDE "event/bug_contest/caught_mon.asm" +INCLUDE "engine/item_effects.asm" +INCLUDE "engine/knows_move.asm" SECTION "bank4", ROMX @@ -388,213 +94,22 @@ INCLUDE "engine/pack.asm" INCLUDE "engine/time.asm" INCLUDE "engine/tmhm.asm" INCLUDE "engine/namingscreen.asm" - -Script_AbortBugContest: ; 0x122c1 - checkflag ENGINE_BUG_CONTEST_TIMER - iffalse .finish - setflag ENGINE_DAILY_BUG_CONTEST - special ContestReturnMons -.finish - end - -INCLUDE "event/itemball.asm" -INCLUDE "engine/healmachineanim.asm" +INCLUDE "event/misc_scripts.asm" +INCLUDE "event/heal_machine_anim.asm" INCLUDE "event/whiteout.asm" INCLUDE "event/forced_movement.asm" INCLUDE "event/itemfinder.asm" -INCLUDE "engine/startmenu.asm" -INCLUDE "engine/selectmenu.asm" +INCLUDE "engine/start_menu.asm" +INCLUDE "engine/select_menu.asm" INCLUDE "event/elevator.asm" - -Special_GiveParkBalls: ; 135db - xor a - ld [wContestMon], a - ld a, 20 - ld [wParkBallsRemaining], a - callba StartBugContestTimer - ret - -BugCatchingContestBattleScript:: ; 0x135eb - writecode VAR_BATTLETYPE, BATTLETYPE_CONTEST - randomwildmon - startbattle - reloadmapafterbattle - copybytetovar wParkBallsRemaining - iffalse BugCatchingContestOutOfBallsScript - end - -BugCatchingContestOverScript:: ; 0x135f8 - playsound SFX_ELEVATOR_END - opentext - writetext BugCatchingContestText_BeeepTimesUp - waitbutton - jump BugCatchingContestReturnToGateScript - -BugCatchingContestOutOfBallsScript: ; 0x13603 - playsound SFX_ELEVATOR_END - opentext - writetext BugCatchingContestText_ContestIsOver - waitbutton - -BugCatchingContestReturnToGateScript: ; 0x1360b - closetext - jumpstd bugcontestresultswarp - -BugCatchingContestText_BeeepTimesUp: ; 0x1360f - ; ANNOUNCER: BEEEP! Time's up! - text_jump UnknownText_0x1bd2ca - db "@" - -BugCatchingContestText_ContestIsOver: ; 0x13614 - ; ANNOUNCER: The Contest is over! - text_jump UnknownText_0x1bd2e7 - db "@" - -RepelWoreOffScript:: ; 0x13619 - opentext - writetext .text - waitbutton - closetext - end - -.text ; 0x13620 - ; REPEL's effect wore off. - text_jump UnknownText_0x1bd308 - db "@" - -HiddenItemScript:: ; 0x13625 - opentext - copybytetovar EngineBuffer3 - itemtotext 0, 0 - writetext .found_text - giveitem ITEM_FROM_MEM - iffalse .bag_full - callasm SetMemEvent - specialsound - itemnotify - jump .finish - -.bag_full ; 0x1363e - buttonsound - writetext .no_room_text - waitbutton - -.finish ; 13643 - closetext - end - -.found_text ; 0x13645 - ; found @ ! - text_jump UnknownText_0x1bd321 - db "@" - -.no_room_text ; 0x1364a - ; But has no space left… - text_jump UnknownText_0x1bd331 - db "@" - -SetMemEvent: ; 1364f - ld hl, EngineBuffer1 - ld a, [hli] - ld d, [hl] - ld e, a - ld b, SET_FLAG - call EventFlagAction - ret - -CheckFacingTileForStd:: ; 1365b -; Checks to see if the tile you're facing has a std script associated with it. If so, executes the script and returns carry. - ld a, c - ld de, 3 - ld hl, TileCollisionStdScripts - call IsInArray - jr nc, .notintable - - ld a, jumpstd_command - ld [wJumpStdScriptBuffer], a - inc hl - ld a, [hli] - ld [wJumpStdScriptBuffer + 1], a - ld a, [hli] - ld [wJumpStdScriptBuffer + 2], a - ld a, BANK(Script_JumpStdFromRAM) - ld hl, Script_JumpStdFromRAM - call CallScript - scf - ret - -.notintable - xor a - ret - -INCLUDE "data/collision_stdscripts.asm" - -Script_JumpStdFromRAM: ; 0x1369a - jump wJumpStdScriptBuffer - -INCLUDE "event/bug_contest_judging.asm" - -ApplyPokerusTick: ; 13988 -; decreases all pokemon's pokerus counter by b. if the lower nybble reaches zero, the pokerus is cured. - ld hl, PartyMon1PokerusStatus ; PartyMon1 + MON_PKRS - ld a, [PartyCount] - and a - ret z ; make sure it's not wasting time on an empty party - ld c, a -.loop - ld a, [hl] - and $f ; lower nybble is the number of days remaining - jr z, .next ; if already 0, skip - sub b ; subtract the number of days - jr nc, .ok ; max(result, 0) - xor a -.ok - ld d, a ; back up this value because we need to preserve the strain (upper nybble) - ld a, [hl] - and $f0 - add d - ld [hl], a ; this prevents a cured pokemon from recontracting pokerus -.next - ld de, PARTYMON_STRUCT_LENGTH - add hl, de - dec c - jr nz, .loop - ret - -INCLUDE "event/bug_contest_2.asm" - -INCLUDE "unknown/013a47.asm" - -GetSquareRoot: ; 13b87 -; Return the square root of de in b. - -; Rather than calculating the result, we take the index of the -; first value in a table of squares that isn't lower than de. - - ld hl, Squares - ld b, 0 -.loop -; Make sure we don't go past the end of the table. - inc b - ld a, b - cp $ff - ret z - -; Iterate over the table until b**2 >= de. - ld a, [hli] - sub e - ld a, [hli] - sbc d - - jr c, .loop - ret - -Squares: ; 13b98 -root set 1 - rept $ff - dw root*root -root set root+1 - endr +INCLUDE "event/bug_contest/contest.asm" +INCLUDE "event/misc_scripts_2.asm" +INCLUDE "event/std_collision.asm" +INCLUDE "event/bug_contest/judging.asm" +INCLUDE "engine/pokerus_tick.asm" +INCLUDE "event/bug_contest/contest_2.asm" +INCLUDE "engine/unused_correct_party.asm" +INCLUDE "engine/square_root.asm" SECTION "bank5", ROMX @@ -608,13 +123,12 @@ INCLUDE "engine/map_setup.asm" INCLUDE "engine/pokecenter_pc.asm" INCLUDE "engine/mart.asm" INCLUDE "engine/money.asm" -INCLUDE "items/marts.asm" +INCLUDE "data/items/marts.asm" INCLUDE "event/mom.asm" INCLUDE "event/daycare.asm" -INCLUDE "event/photo.asm" -INCLUDE "engine/breeding/egg.asm" - - +INCLUDE "event/print_unown.asm" +INCLUDE "event/print_photo.asm" +INCLUDE "engine/breeding.asm" INCLUDE "tilesets/data.asm" @@ -625,15 +139,7 @@ INCLUDE "engine/clock_reset.asm" SECTION "bank9", ROMX -StringBufferPointers:: ; 24000 - dw StringBuffer3 - dw StringBuffer4 - dw StringBuffer5 - dw StringBuffer2 - dw StringBuffer1 - dw EnemyMonNick - dw BattleMonNick - +INCLUDE "data/text_buffers.asm" INCLUDE "engine/menu.asm" UpdateItemDescription: ; 0x244c3 @@ -651,345 +157,10 @@ UpdateItemDescription: ; 0x244c3 ret INCLUDE "engine/pokepic.asm" - -LoadObjectMasks: ; 2454f - ld hl, wObjectMasks - xor a - ld bc, NUM_OBJECTS - call ByteFill - nop - ld bc, MapObjects - ld de, wObjectMasks - xor a -.loop - push af - push bc - push de - call GetObjectTimeMask - jr c, .next - call CheckObjectFlag -.next - pop de - ld [de], a - inc de - pop bc - ld hl, OBJECT_LENGTH - add hl, bc - ld b, h - ld c, l - pop af - inc a - cp NUM_OBJECTS - jr nz, .loop - ret - -CheckObjectFlag: ; 2457d (9:457d) - ld hl, MAPOBJECT_SPRITE - add hl, bc - ld a, [hl] - and a - jr z, .masked - ld hl, MAPOBJECT_EVENT_FLAG - add hl, bc - ld a, [hli] - ld e, a - ld a, [hl] - ld d, a - cp -1 - jr nz, .check - ld a, e - cp -1 - jr z, .unmasked - jr .masked -.check - ld b, CHECK_FLAG - call EventFlagAction - ld a, c - and a - jr nz, .masked -.unmasked - xor a - ret - -.masked - ld a, -1 - scf - ret - -GetObjectTimeMask: ; 245a7 (9:45a7) - call CheckObjectTime - ld a, -1 - ret c - xor a - ret - +INCLUDE "engine/map_objects_2.asm" INCLUDE "engine/scrolling_menu.asm" INCLUDE "engine/switch_items.asm" - -PlaceMenuItemName: ; 0x24ab4 - push de - ld a, [MenuSelection] - ld [wNamedObjectIndexBuffer], a - call GetItemName - pop hl - call PlaceString - ret - -PlaceMenuItemQuantity: ; 0x24ac3 - push de - ld a, [MenuSelection] - ld [CurItem], a - callba _CheckTossableItem - ld a, [wItemAttributeParamBuffer] - pop hl - and a - jr nz, .done - ld de, $15 - add hl, de - ld [hl], "×" - inc hl - ld de, MenuSelectionQuantity - lb bc, 1, 2 - call PrintNum - -.done - ret - -PlaceMoneyTopRight: ; 24ae8 - ld hl, MenuDataHeader_0x24b15 - call CopyMenuDataHeader - jr PlaceMoneyDataHeader - -PlaceMoneyBottomLeft: ; 24af0 - ld hl, MenuDataHeader_0x24b1d - call CopyMenuDataHeader - jr PlaceMoneyDataHeader - -PlaceMoneyAtTopLeftOfTextbox: ; 24af8 - ld hl, MenuDataHeader_0x24b15 - lb de, 0, 11 - call OffsetMenuDataHeader - -PlaceMoneyDataHeader: ; 24b01 - call MenuBox - call MenuBoxCoord2Tile - ld de, SCREEN_WIDTH + 1 - add hl, de - ld de, Money - lb bc, PRINTNUM_MONEY | 3, 6 - call PrintNum - ret - -MenuDataHeader_0x24b15: ; 0x24b15 - db $40 ; flags - db 00, 11 ; start coords - db 02, 19 ; end coords - dw NULL - db 1 ; default option - -MenuDataHeader_0x24b1d: ; 0x24b1d - db $40 ; flags - db 11, 00 ; start coords - db 13, 08 ; end coords - dw NULL - db 1 ; default option - -Special_DisplayCoinCaseBalance: ; 24b25 - ; Place a text box of size 1x7 at 11, 0. - hlcoord 11, 0 - ld b, 1 - ld c, 7 - call TextBox - hlcoord 12, 0 - ld de, CoinString - call PlaceString - hlcoord 17, 1 - ld de, ShowMoney_TerminatorString - call PlaceString - ld de, Coins - lb bc, 2, 4 - hlcoord 13, 1 - call PrintNum - ret - -Special_DisplayMoneyAndCoinBalance: ; 24b4e - hlcoord 5, 0 - ld b, 3 - ld c, 13 - call TextBox - hlcoord 6, 1 - ld de, MoneyString - call PlaceString - hlcoord 12, 1 - ld de, Money - lb bc, PRINTNUM_MONEY | 3, 6 - call PrintNum - hlcoord 6, 3 - ld de, CoinString - call PlaceString - hlcoord 15, 3 - ld de, Coins - lb bc, 2, 4 - call PrintNum - ret - -MoneyString: ; 24b83 - db "MONEY@" -CoinString: ; 24b89 - db "COIN@" -ShowMoney_TerminatorString: ; 24b8e - db "@" - -Function24b8f: ; 24b8f -; unreferenced, related to safari? - ld hl, Options - ld a, [hl] - push af - set NO_TEXT_SCROLL, [hl] - hlcoord 0, 0 - ld b, 3 - ld c, 7 - call TextBox - hlcoord 1, 1 - ld de, wSafariTimeRemaining - lb bc, 2, 3 - call PrintNum - hlcoord 4, 1 - ld de, .slash_500 - call PlaceString - hlcoord 1, 3 - ld de, .booru_ko - call PlaceString - hlcoord 5, 3 - ld de, wSafariBallsRemaining - lb bc, 1, 2 - call PrintNum - pop af - ld [Options], a - ret - -.slash_500 ; 24bcf - db "/500@" -.booru_ko ; 24bd4 - db "ボール こ@" - -StartMenu_DrawBugContestStatusBox: ; 24bdc - hlcoord 0, 0 - ld b, 5 - ld c, 17 - call TextBox - ret - -StartMenu_PrintBugContestStatus: ; 24be7 - ld hl, Options - ld a, [hl] - push af - set NO_TEXT_SCROLL, [hl] - call StartMenu_DrawBugContestStatusBox - hlcoord 1, 5 - ld de, .Balls_EN - call PlaceString - hlcoord 8, 5 - ld de, wParkBallsRemaining - lb bc, PRINTNUM_RIGHTALIGN | 1, 2 - call PrintNum - hlcoord 1, 1 - ld de, .CAUGHT - call PlaceString - ld a, [wContestMon] - and a - ld de, .None - jr z, .no_contest_mon - ld [wd265], a - call GetPokemonName - -.no_contest_mon - hlcoord 8, 1 - call PlaceString - ld a, [wContestMon] - and a - jr z, .skip_level - hlcoord 1, 3 - ld de, .LEVEL - call PlaceString - ld a, [wContestMonLevel] - ld h, b - ld l, c - inc hl - ld c, 3 - call Print8BitNumRightAlign - -.skip_level - pop af - ld [Options], a - ret - -.Balls_JP: ; 24c43 - db "ボール こ@" -.CAUGHT: ; 24c4b - db "CAUGHT@" -.Balls_EN: ; 24c52 - db "BALLS:@" -.None: ; 24c59 - db "None@" -.LEVEL: ; 24c5e - db "LEVEL@" - -FindApricornsInBag: ; 24c64 -; Checks the bag for Apricorns. - ld hl, Buffer1 - xor a - ld [hli], a - dec a - ld bc, 10 - call ByteFill - - ld hl, .ApricornBalls -.loop - ld a, [hl] - cp -1 - jr z, .done - push hl - ld [CurItem], a - ld hl, NumItems - call CheckItem - pop hl - jr nc, .nope - ld a, [hl] - call .addtobuffer -.nope - inc hl - inc hl - jr .loop - -.done - ld a, [Buffer1] - and a - ret nz - scf - ret - -.addtobuffer ; 24c94 - push hl - ld hl, Buffer1 - inc [hl] - ld e, [hl] - ld d, 0 - add hl, de - ld [hl], a - pop hl - ret - -.ApricornBalls: ; 24ca0 - db RED_APRICORN, LEVEL_BALL - db BLU_APRICORN, LURE_BALL - db YLW_APRICORN, MOON_BALL - db GRN_APRICORN, FRIEND_BALL - db WHT_APRICORN, FAST_BALL - db BLK_APRICORN, HEAVY_BALL - db PNK_APRICORN, LOVE_BALL - db -1 - +INCLUDE "engine/menu_2.asm" INCLUDE "engine/mon_menu.asm" INCLUDE "battle/menu.asm" INCLUDE "engine/buy_sell_toss.asm" @@ -997,16 +168,6 @@ INCLUDE "engine/trainer_card.asm" INCLUDE "engine/prof_oaks_pc.asm" INCLUDE "engine/decorations.asm" -PadCoords_de: ; 27092 - ld a, d - add 4 - ld d, a - ld a, e - add 4 - ld e, a - call GetBlockLocation - ret - LevelUpHappinessMod: ; 2709e ld a, [CurPartyMon] ld hl, PartyMon1CaughtLocation @@ -1028,7 +189,7 @@ LevelUpHappinessMod: ; 2709e callab ChangeHappiness ret -INCLUDE "trainers/dvs.asm" +INCLUDE "data/trainers/trainer_dvs.asm" _ReturnToBattle_UseBall: ; 2715c call ClearBGPalettes @@ -1050,91 +211,8 @@ _ReturnToBattle_UseBall: ; 2715c call WaitBGMap jp SetPalettes -ConsumeHeldItem: ; 27192 - push hl - push de - push bc - ld a, [hBattleTurn] - and a - ld hl, OTPartyMon1Item - ld de, EnemyMonItem - ld a, [CurOTMon] - jr z, .theirturn - ld hl, PartyMon1Item - ld de, BattleMonItem - ld a, [CurBattleMon] - -.theirturn - push hl - push af - ld a, [de] - ld b, a - callba GetItemHeldEffect - ld hl, .ConsumableEffects -.loop - ld a, [hli] - cp b - jr z, .ok - inc a - jr nz, .loop - pop af - pop hl - pop bc - pop de - pop hl - ret - -.ok - xor a - ld [de], a - pop af - pop hl - call GetPartyLocation - ld a, [hBattleTurn] - and a - jr nz, .ourturn - ld a, [wBattleMode] - dec a - jr z, .done - -.ourturn - ld [hl], $0 - -.done - pop bc - pop de - pop hl - ret - -.ConsumableEffects: ; 271de -; Consumable items? - db HELD_BERRY - db HELD_2 - db HELD_5 - db HELD_HEAL_POISON - db HELD_HEAL_FREEZE - db HELD_HEAL_BURN - db HELD_HEAL_SLEEP - db HELD_HEAL_PARALYZE - db HELD_HEAL_STATUS - db HELD_30 - db HELD_ATTACK_UP - db HELD_DEFENSE_UP - db HELD_SPEED_UP - db HELD_SP_ATTACK_UP - db HELD_SP_DEFENSE_UP - db HELD_ACCURACY_UP - db HELD_EVASION_UP - db HELD_38 - db HELD_71 - db HELD_ESCAPE - db HELD_CRITICAL_UP - db -1 - -MoveEffectsPointers: ; 271f4 +INCLUDE "engine/consume_held_item.asm" INCLUDE "battle/moves/move_effects_pointers.asm" - -MoveEffects: ; 2732e INCLUDE "battle/moves/move_effects.asm" Kurt_SelectQuantity_InterpretJoypad: ; 27a28 @@ -1146,462 +224,23 @@ Kurt_SelectQuantity_InterpretJoypad: ; 27a28 SECTION "bankA", ROMX INCLUDE "engine/link.asm" - -Function29fe4: ; unreferenced - ld a, $0 - call GetSRAMBank - ld d, $0 - ld b, CHECK_FLAG - predef FlagPredef - call CloseSRAM - ld a, c - and a - ret - INCLUDE "engine/wildmons.asm" INCLUDE "battle/link_result.asm" - -ChrisBackpic: ; 2ba1a -INCBIN "gfx/player/chris_back.2bpp.lz" - -DudeBackpic: ; 2bbaa -INCBIN "gfx/battle/dude.2bpp.lz" +INCLUDE "engine/player_gfx_2.asm" SECTION "bankB", ROMX INCLUDE "battle/trainer_huds.asm" - -TrainerClassNames:: ; 2c1ef -INCLUDE "text/trainer_class_names.asm" - +INCLUDE "data/trainers/trainer_class_names.asm" INCLUDE "battle/ai/redundant.asm" - INCLUDE "event/move_deleter.asm" - -INCLUDE "engine/mysterygift2.asm" - +INCLUDE "engine/mystery_gift_2.asm" INCLUDE "engine/tmhm2.asm" - -MoveDescriptions:: ; 2cb52 INCLUDE "battle/moves/move_descriptions.asm" - -GivePokerusAndConvertBerries: ; 2ed44 - call ConvertBerriesToBerryJuice - ld hl, PartyMon1PokerusStatus - ld a, [PartyCount] - ld b, a - ld de, PARTYMON_STRUCT_LENGTH -; Check to see if any of your Pokemon already has Pokerus. -; If so, sample its spread through your party. -; This means that you cannot get Pokerus de novo while -; a party member has an active infection. -.loopMons - ld a, [hl] - and $f - jr nz, .TrySpreadPokerus - add hl, de - dec b - jr nz, .loopMons - -; If we haven't been to Goldenrod City at least once, -; prevent the contraction of Pokerus. - ld hl, StatusFlags2 - bit 6, [hl] - ret z - call Random - ld a, [hRandomAdd] - and a - ret nz - ld a, [hRandomSub] - cp $3 - ret nc ; 3/65536 chance (00 00, 00 01 or 00 02) - ld a, [PartyCount] - ld b, a -.randomMonSelectLoop - call Random - and $7 - cp b - jr nc, .randomMonSelectLoop - ld hl, PartyMon1PokerusStatus - call GetPartyLocation ; get pokerus byte of random mon - ld a, [hl] - and $f0 - ret nz ; if it already has pokerus, do nothing -.randomPokerusLoop ; Simultaneously sample the strain and duration - call Random - and a - jr z, .randomPokerusLoop - ld b, a - and $f0 - jr z, .load_pkrs - ld a, b - and $7 - inc a -.load_pkrs - ld b, a ; this should come before the label - swap b - and $3 - inc a - add b - ld [hl], a - ret - -.TrySpreadPokerus: - call Random - cp 1 + 33 percent - ret nc ; 1/3 chance - - ld a, [PartyCount] - cp 1 - ret z ; only one mon, nothing to do - - ld c, [hl] - ld a, b - cp 2 - jr c, .checkPreviousMonsLoop ; no more mons after this one, go backwards - - call Random - cp 1 + 50 percent - jr c, .checkPreviousMonsLoop ; 1/2 chance, go backwards -.checkFollowingMonsLoop - add hl, de - ld a, [hl] - and a - jr z, .infectMon - ld c, a - and $3 - ret z ; if mon has cured pokerus, stop searching - dec b ; go on to next mon - ld a, b - cp 1 - jr nz, .checkFollowingMonsLoop ; no more mons left - ret - -.checkPreviousMonsLoop - ld a, [PartyCount] - cp b - ret z ; no more mons - ld a, l - sub e - ld l, a - ld a, h - sbc d - ld h, a - ld a, [hl] - and a - jr z, .infectMon - ld c, a - and $3 - ret z ; if mon has cured pokerus, stop searching - inc b ; go on to next mon - jr .checkPreviousMonsLoop - -.infectMon - ld a, c - and $f0 - ld b, a - ld a, c - swap a - and $3 - inc a - add b - ld [hl], a - ret - -; any berry held by a Shuckle may be converted to berry juice -ConvertBerriesToBerryJuice: ; 2ede6 - ld hl, StatusFlags2 - bit 6, [hl] - ret z - call Random - cp $10 - ret nc ; 1/16 chance - ld hl, PartyMons - ld a, [PartyCount] -.partyMonLoop - push af - push hl - ld a, [hl] - cp SHUCKLE - jr nz, .loopMon - ld bc, MON_ITEM - add hl, bc - ld a, [hl] - cp BERRY - jr z, .convertToJuice - -.loopMon - pop hl - ld bc, PARTYMON_STRUCT_LENGTH - add hl, bc - pop af - dec a - jr nz, .partyMonLoop - ret - -.convertToJuice - ld a, BERRY_JUICE - ld [hl], a - pop hl - pop af - ret - -ShowLinkBattleParticipants: ; 2ee18 -; If we're not in a communications room, -; we don't need to be here. - ld a, [wLinkMode] - and a - ret z - - callba _ShowLinkBattleParticipants - ld c, 150 - call DelayFrames - call ClearTileMap - call ClearSprites - ret - -FindFirstAliveMonAndStartBattle: ; 2ee2f - xor a - ld [hMapAnims], a - call DelayFrame - ld b, 6 - ld hl, PartyMon1HP - ld de, PARTYMON_STRUCT_LENGTH - 1 - -.loop - ld a, [hli] - or [hl] - jr nz, .okay - add hl, de - dec b - jr nz, .loop - -.okay - ld de, MON_LEVEL - MON_HP - add hl, de - ld a, [hl] - ld [BattleMonLevel], a - predef Predef_StartBattle - callba _LoadBattleFontsHPBar - ld a, 1 - ld [hBGMapMode], a - call ClearSprites - call ClearTileMap - xor a - ld [hBGMapMode], a - ld [hWY], a - ld [rWY], a - ld [hMapAnims], a - ret - -PlayBattleMusic: ; 2ee6c - - push hl - push de - push bc - - xor a - ld [MusicFade], a - ld de, MUSIC_NONE - call PlayMusic - call DelayFrame - call MaxVolume - - ld a, [BattleType] - cp BATTLETYPE_SUICUNE - ld de, MUSIC_SUICUNE_BATTLE - jp z, .done - cp BATTLETYPE_ROAMING - jp z, .done - - ; Are we fighting a trainer? - ld a, [OtherTrainerClass] - and a - jr nz, .trainermusic - - callba RegionCheck - ld a, e - and a - jr nz, .kantowild - - ld de, MUSIC_JOHTO_WILD_BATTLE - ld a, [TimeOfDay] - cp NITE_F - jr nz, .done - ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT - jr .done - -.kantowild - ld de, MUSIC_KANTO_WILD_BATTLE - jr .done - -.trainermusic - ld de, MUSIC_CHAMPION_BATTLE - cp CHAMPION - jr z, .done - cp RED - jr z, .done - - ; really, they should have included admins and scientists here too... - ld de, MUSIC_ROCKET_BATTLE - cp GRUNTM - jr z, .done - cp GRUNTF - jr z, .done - - ld de, MUSIC_KANTO_GYM_LEADER_BATTLE - callba IsKantoGymLeader - jr c, .done - - ld de, MUSIC_JOHTO_GYM_LEADER_BATTLE - callba IsJohtoGymLeader - jr c, .done - - ld de, MUSIC_RIVAL_BATTLE - ld a, [OtherTrainerClass] - cp RIVAL1 - jr z, .done - cp RIVAL2 - jr nz, .othertrainer - - ld a, [OtherTrainerID] - cp RIVAL2_2_CHIKORITA ; Rival in Indigo Plateau - jr c, .done - ld de, MUSIC_CHAMPION_BATTLE - jr .done - -.othertrainer - ld a, [wLinkMode] - and a - jr nz, .johtotrainer - - callba RegionCheck - ld a, e - and a - jr nz, .kantotrainer - -.johtotrainer - ld de, MUSIC_JOHTO_TRAINER_BATTLE - jr .done - -.kantotrainer - ld de, MUSIC_KANTO_TRAINER_BATTLE - -.done - call PlayMusic - - pop bc - pop de - pop hl - ret - -ClearBattleRAM: ; 2ef18 - xor a - ld [wPlayerAction], a - ld [wBattleResult], a - - ld hl, wPartyMenuCursor - ld [hli], a - ld [hli], a - ld [hli], a - ld [hl], a - - ld [wMenuScrollPosition], a - ld [CriticalHit], a - ld [BattleMonSpecies], a - ld [wBattleParticipantsNotFainted], a - ld [CurBattleMon], a - ld [wForcedSwitch], a - ld [TimeOfDayPal], a - ld [PlayerTurnsTaken], a - ld [EnemyTurnsTaken], a - ld [EvolvableFlags], a - - ld hl, PlayerHPPal - ld [hli], a - ld [hl], a - - ld hl, BattleMonDVs - ld [hli], a - ld [hl], a - - ld hl, EnemyMonDVs - ld [hli], a - ld [hl], a - -; Clear the entire BattleMons area - ld hl, wBattle - ld bc, wBattleEnd - wBattle - xor a - call ByteFill - - callab ResetEnemyStatLevels - - call ClearWindowData - - ld hl, hBGMapAddress - xor a - ld [hli], a - ld [hl], VBGMap0 / $100 - ret - -PlaceGraphic: ; 2ef6e -; Fill wBoxAlignment-aligned box width b height c -; with iterating tile starting from hGraphicStartTile at hl. -; Predef $13 - - ld de, SCREEN_WIDTH - - ld a, [wBoxAlignment] - and a - jr nz, .right - - ld a, [hGraphicStartTile] -.x1 - push bc - push hl - -.y1 - ld [hl], a - add hl, de - inc a - dec c - jr nz, .y1 - - pop hl - inc hl - pop bc - dec b - jr nz, .x1 - ret - -.right -; Right-aligned. - push bc - ld b, 0 - dec c - add hl, bc - pop bc - - ld a, [hGraphicStartTile] -.x2 - push bc - push hl - -.y2 - ld [hl], a - add hl, de - inc a - dec c - jr nz, .y2 - - pop hl - dec hl - pop bc - dec b - jr nz, .x2 - ret +INCLUDE "engine/pokerus.asm" +INCLUDE "engine/start_battle.asm" +INCLUDE "engine/place_graphics.asm" SECTION "Effect Commands", ROMX @@ -1613,11 +252,11 @@ SECTION "Enemy Trainers", ROMX INCLUDE "battle/ai/items.asm" INCLUDE "battle/ai/scoring.asm" -INCLUDE "trainers/read_attributes.asm" -INCLUDE "trainers/attributes.asm" -INCLUDE "trainers/read_party.asm" -INCLUDE "trainers/trainer_pointers.asm" -INCLUDE "trainers/trainers.asm" +INCLUDE "engine/read_trainer_attributes.asm" +INCLUDE "data/trainers/trainer_attributes.asm" +INCLUDE "engine/read_trainer_party.asm" +INCLUDE "data/trainers/party_pointers.asm" +INCLUDE "data/trainers/parties.asm" SECTION "Battle Core", ROMX @@ -1638,330 +277,37 @@ SECTION "bank11", ROMX INCLUDE "engine/fruit_trees.asm" INCLUDE "battle/ai/move.asm" INCLUDE "engine/pokedex_2.asm" -INCLUDE "data/pokedex/entry_pointers.asm" +INCLUDE "data/pokemon/dex_entry_pointers.asm" INCLUDE "engine/mail.asm" SECTION "Crystal Unique", ROMX INCLUDE "engine/init_gender.asm" - -DrawKrisPackGFX: ; 48e81 - ld hl, PackFGFXPointers - add hl, de - add hl, de - ld a, [hli] - ld e, a - ld d, [hl] - ld hl, VTiles2 tile $50 - lb bc, BANK(PackFGFX), 15 - call Request2bpp - ret - -PackFGFXPointers: ; 48e93 - dw PackFGFX + (15 tiles) * 1 - dw PackFGFX + (15 tiles) * 3 - dw PackFGFX + (15 tiles) * 0 - dw PackFGFX + (15 tiles) * 2 - -PackFGFX: ; 48e9b -INCBIN "gfx/pack/pack_f.2bpp" - -Special_MoveTutor: ; 4925b - call FadeToMenu - call ClearBGPalettes - call ClearScreen - call DelayFrame - ld b, SCGB_PACKPALS - call GetSGBLayout - xor a - ld [wItemAttributeParamBuffer], a - call .GetMoveTutorMove - ld [wd265], a - ld [wPutativeTMHMMove], a - call GetMoveName - call CopyName1 - callba ChooseMonToLearnTMHM - jr c, .cancel - jr .enter_loop - -.loop - callba ChooseMonToLearnTMHM_NoRefresh - jr c, .cancel -.enter_loop - call CheckCanLearnMoveTutorMove - jr nc, .loop - xor a - ld [ScriptVar], a - jr .quit - -.cancel - ld a, -1 - ld [ScriptVar], a -.quit - call CloseSubmenu - ret - -.GetMoveTutorMove: ; 492a5 - ld a, [ScriptVar] - cp 1 - jr z, .flamethrower - cp 2 - jr z, .thunderbolt - ld a, ICE_BEAM - ret - -.flamethrower - ld a, FLAMETHROWER - ret - -.thunderbolt - ld a, THUNDERBOLT - ret - -CheckCanLearnMoveTutorMove: ; 492b9 - ld hl, .MenuDataHeader - call LoadMenuDataHeader - - predef CanLearnTMHMMove - - push bc - ld a, [CurPartyMon] - ld hl, PartyMonNicknames - call GetNick - pop bc - - ld a, c - and a - jr nz, .can_learn - push de - ld de, SFX_WRONG - call PlaySFX - pop de - ld a, BANK(Text_TMHMNotCompatible) - ld hl, Text_TMHMNotCompatible - call FarPrintText - jr .didnt_learn - -.can_learn - callab KnowsMove - jr c, .didnt_learn - - predef LearnMove - ld a, b - and a - jr z, .didnt_learn - - ld c, HAPPINESS_LEARNMOVE - callab ChangeHappiness - jr .learned - -.didnt_learn - call ExitMenu - and a - ret - -.learned - call ExitMenu - scf - ret - -.MenuDataHeader: ; 0x4930a - db $40 ; flags - db 12, 00 ; start coords - db 17, 19 ; end coords - -INCLUDE "predef/crystal.asm" - -Unknown_4985a: ; unreferenced - db $ab, $03, $57, $24, $ac, $0e, $13, $32 - db $be, $30, $5b, $4c, $47, $60, $ed, $f2 - db $ab, $03, $55, $26, $aa, $0a, $13, $3a - db $be, $28, $33, $24, $6e, $71, $df, $b0 - db $a8, $00, $e5, $e0, $9a, $fc, $f4, $2c - db $fe, $4c, $a3, $5e, $c6, $3a, $ab, $4d - db $a8, $00, $b5, $b0, $de, $e8, $fc, $1c - db $ba, $66, $f7, $0e, $ba, $5e, $43, $bd - +INCLUDE "engine/pack_f.asm" +INCLUDE "event/move_tutor.asm" +INCLUDE "engine/crystal_colors.asm" INCLUDE "event/celebi.asm" INCLUDE "engine/main_menu.asm" -INCLUDE "misc/mobile_menu.asm" +INCLUDE "mobile/mobile_menu.asm" INCLUDE "engine/search.asm" -INCLUDE "misc/mobile_12_2.asm" -; mobile battle selection - -AskRememberPassword: ; 4ae12 - call .DoMenu - ld a, $0 - jr c, .okay - ld a, $1 - -.okay - ld [ScriptVar], a - ret - -.DoMenu: ; 4ae1f - lb bc, 14, 7 - push bc - ld hl, YesNoMenuDataHeader - call CopyMenuDataHeader - pop bc - ld a, b - ld [wMenuBorderLeftCoord], a - add $5 - ld [wMenuBorderRightCoord], a - ld a, c - ld [wMenuBorderTopCoord], a - add $4 - ld [wMenuBorderBottomCoord], a - call PushWindow - call VerticalMenu - push af - ld c, 15 - call DelayFrames - call Buena_ExitMenu - pop af - jr c, .refused - ld a, [wMenuCursorY] - cp $2 - jr z, .refused - and a - ret - -.refused - ld a, $2 - ld [wMenuCursorY], a - scf - ret - -Buena_ExitMenu: ; 4ae5e - ld a, [hOAMUpdate] - push af - call ExitMenu - call UpdateSprites - xor a - ld [hOAMUpdate], a - call DelayFrame - ld a, $1 - ld [hOAMUpdate], a - call ApplyTilemap - pop af - ld [hOAMUpdate], a - ret +INCLUDE "mobile/mobile_12_2.asm" +INCLUDE "event/buena_menu.asm" SECTION "bank13", ROMX -SwapTextboxPalettes:: ; 4c000 - hlcoord 0, 0 - decoord 0, 0, AttrMap - ld b, SCREEN_HEIGHT -.loop - push bc - ld c, SCREEN_WIDTH -.innerloop - ld a, [hl] - push hl - srl a - jr c, .UpperNybble - ld hl, TilesetPalettes - add [hl] - ld l, a - ld a, [TilesetPalettes + 1] - adc $0 - ld h, a - ld a, [hl] - and $f - jr .next - -.UpperNybble: - ld hl, TilesetPalettes - add [hl] - ld l, a - ld a, [TilesetPalettes + 1] - adc $0 - ld h, a - ld a, [hl] - swap a - and $f - -.next - pop hl - ld [de], a - res 7, [hl] - inc hl - inc de - dec c - jr nz, .innerloop - pop bc - dec b - jr nz, .loop - ret - -ScrollBGMapPalettes:: ; 4c03f - ld hl, BGMapBuffer - ld de, BGMapPalBuffer -.loop - ld a, [hl] - push hl - srl a - jr c, .UpperNybble - -; .LowerNybble - ld hl, TilesetPalettes - add [hl] - ld l, a - ld a, [TilesetPalettes + 1] - adc $0 - ld h, a - ld a, [hl] - and $f - jr .next - -.UpperNybble: - ld hl, TilesetPalettes - add [hl] - ld l, a - ld a, [TilesetPalettes + 1] - adc $0 - ld h, a - ld a, [hl] - swap a - and $f - -.next - pop hl - ld [de], a - res 7, [hl] - inc hl - inc de - dec c - jr nz, .loop - ret - +INCLUDE "engine/map_palettes.asm" INCLUDE "tilesets/palette_maps.asm" +Unknown_4ce05: ; unreferenced +rept 26 + db $06 +endr +; 0x4ce1f + INCLUDE "data/collision_permissions.asm" - -EmptyAllSRAMBanks: ; 4cf1f - ld a, $0 - call .EmptyBank - ld a, $1 - call .EmptyBank - ld a, $2 - call .EmptyBank - ld a, $3 - call .EmptyBank - ret - -.EmptyBank: ; 4cf34 - call GetSRAMBank - ld hl, SRAM_Begin - ld bc, SRAM_End - SRAM_Begin - xor a - call ByteFill - call CloseSRAM - ret +INCLUDE "engine/empty_sram.asm" SaveMenu_LoadEDTile: ; 4cf45 (13:4f45) ld a, [hCGB] @@ -2042,18 +388,18 @@ endr ret CheckSave:: ; 4cffe - ld a, BANK(s1_a008) + ld a, BANK(sCheckValue1) ; BANK(sCheckValue2) call GetSRAMBank - ld a, [s1_a008] + ld a, [sCheckValue1] ld b, a - ld a, [s1_ad0f] + ld a, [sCheckValue2] ld c, a call CloseSRAM ld a, b - cp 99 + cp SAVE_CHECK_VALUE_1 jr nz, .ok ld a, c - cp " " + cp SAVE_CHECK_VALUE_2 jr nz, .ok ld c, $1 ret @@ -2062,7 +408,7 @@ CheckSave:: ; 4cffe ld c, $0 ret -INCLUDE "data/map_triggers.asm" +INCLUDE "data/maps/map_triggers.asm" _LoadMapPart:: ; 4d15b ld hl, wMisc @@ -2281,118 +627,9 @@ LinkTextbox2: ; 4d35b ret INCLUDE "engine/delete_save_change_clock.asm" - INCLUDE "tilesets/tileset_headers.asm" - -FlagPredef: ; 4d7c1 -; Perform action b on flag c in flag array hl. -; If checking a flag, check flag array d:hl unless d is 0. - -; For longer flag arrays, see FlagAction. - - push hl - push bc - -; Divide by 8 to get the byte we want. - push bc - srl c - srl c - srl c - ld b, 0 - add hl, bc - pop bc - -; Which bit we want from the byte - ld a, c - and 7 - ld c, a - -; Shift left until we can mask the bit - ld a, 1 - jr z, .shifted -.shift - add a - dec c - jr nz, .shift -.shifted - ld c, a - -; What are we doing to this flag? - dec b - jr z, .set ; 1 - dec b - jr z, .check ; 2 - -.reset - ld a, c - cpl - and [hl] - ld [hl], a - jr .done - -.set - ld a, [hl] - or c - ld [hl], a - jr .done - -.check - ld a, d - cp 0 - jr nz, .farcheck - - ld a, [hl] - and c - jr .done - -.farcheck - call GetFarByte - and c - -.done - pop bc - pop hl - ld c, a - ret - -GetTrademonFrontpic: ; 4d7fd - ld a, [wOTTrademonSpecies] - ld hl, wOTTrademonDVs - ld de, VTiles2 - push de - push af - predef GetUnownLetter - pop af - ld [CurPartySpecies], a - ld [CurSpecies], a - call GetBaseData - pop de - predef FrontpicPredef - ret - -AnimateTrademonFrontpic: ; 4d81e - ld a, [wOTTrademonSpecies] - call IsAPokemon - ret c - callba ShowOTTrademonStats - ld a, [wOTTrademonSpecies] - ld [CurPartySpecies], a - ld a, [wOTTrademonDVs] - ld [TempMonDVs], a - ld a, [wOTTrademonDVs + 1] - ld [TempMonDVs + 1], a - ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS - call GetSGBLayout - ld a, %11100100 ; 3,2,1,0 - call DmgToCgbBGPals - callba TradeAnim_ShowGetmonFrontpic - ld a, [wOTTrademonSpecies] - ld [CurPartySpecies], a - hlcoord 7, 2 - ld d, $0 - ld e, ANIM_MON_TRADE - predef AnimateFrontpic - ret +INCLUDE "engine/flag_predef.asm" +INCLUDE "engine/trademon_frontpic.asm" CheckPokerus: ; 4d860 ; Return carry if a monster in your party has Pokerus @@ -2420,779 +657,18 @@ CheckPokerus: ; 4d860 scf ret -Special_CheckForLuckyNumberWinners: ; 4d87a - xor a - ld [ScriptVar], a - ld [wFoundMatchingIDInParty], a - ld a, [PartyCount] - and a - ret z - ld d, a - ld hl, PartyMon1ID - ld bc, PartySpecies -.PartyLoop: - ld a, [bc] - inc bc - cp EGG - call nz, .CompareLuckyNumberToMonID - push bc - ld bc, PARTYMON_STRUCT_LENGTH - add hl, bc - pop bc - dec d - jr nz, .PartyLoop - ld a, BANK(sBox) - call GetSRAMBank - ld a, [sBoxCount] - and a - jr z, .SkipOpenBox - ld d, a - ld hl, sBoxMon1ID - ld bc, sBoxSpecies -.OpenBoxLoop: - ld a, [bc] - inc bc - cp EGG - jr z, .SkipOpenBoxMon - call .CompareLuckyNumberToMonID - jr nc, .SkipOpenBoxMon - ld a, 1 - ld [wFoundMatchingIDInParty], a - -.SkipOpenBoxMon: - push bc - ld bc, BOXMON_STRUCT_LENGTH - add hl, bc - pop bc - dec d - jr nz, .OpenBoxLoop - -.SkipOpenBox: - call CloseSRAM - ld c, $0 -.BoxesLoop: - ld a, [wCurBox] - and $f - cp c - jr z, .SkipBox - ld hl, .BoxBankAddresses - ld b, 0 - add hl, bc - add hl, bc - add hl, bc - ld a, [hli] - call GetSRAMBank - ld a, [hli] - ld h, [hl] - ld l, a ; hl now contains the address of the loaded box in SRAM - ld a, [hl] - and a - jr z, .SkipBox ; no mons in this box - push bc - ld b, h - ld c, l - inc bc - ld de, sBoxMon1ID - sBox - add hl, de - ld d, a -.BoxNLoop: - ld a, [bc] - inc bc - cp EGG - jr z, .SkipBoxMon - - call .CompareLuckyNumberToMonID ; sets ScriptVar and CurPartySpecies appropriately - jr nc, .SkipBoxMon - ld a, 1 - ld [wFoundMatchingIDInParty], a - -.SkipBoxMon: - push bc - ld bc, BOXMON_STRUCT_LENGTH - add hl, bc - pop bc - dec d - jr nz, .BoxNLoop - pop bc - -.SkipBox: - inc c - ld a, c - cp NUM_BOXES - jr c, .BoxesLoop - - call CloseSRAM - ld a, [ScriptVar] - and a - ret z ; found nothing - callba TrainerRankings_LuckyNumberShow - ld a, [wFoundMatchingIDInParty] - and a - push af - ld a, [CurPartySpecies] - ld [wNamedObjectIndexBuffer], a - call GetPokemonName - ld hl, .FoundPartymonText - pop af - jr z, .print - ld hl, .FoundBoxmonText - -.print - jp PrintText - -.CompareLuckyNumberToMonID: ; 4d939 - push bc - push de - push hl - ld d, h - ld e, l - ld hl, Buffer1 - lb bc, PRINTNUM_LEADINGZEROS | 2, 5 - call PrintNum - ld hl, LuckyNumberDigit1Buffer - ld de, wLuckyIDNumber - lb bc, PRINTNUM_LEADINGZEROS | 2, 5 - call PrintNum - ld b, 5 - ld c, 0 - ld hl, LuckyNumberDigit5Buffer - ld de, Buffer5 -.loop - ld a, [de] - cp [hl] - jr nz, .done - dec de - dec hl - inc c - dec b - jr nz, .loop - -.done - pop hl - push hl - ld de, -6 - add hl, de - ld a, [hl] - pop hl - pop de - push af - ld a, c - ld b, 1 - cp 5 - jr z, .okay - ld b, 2 - cp 3 - jr nc, .okay - ld b, 3 - cp 2 - jr nz, .nomatch - -.okay - inc b - ld a, [ScriptVar] - and a - jr z, .bettermatch - cp b - jr c, .nomatch - -.bettermatch - dec b - ld a, b - ld [ScriptVar], a - pop bc - ld a, b - ld [CurPartySpecies], a - pop bc - scf - ret - -.nomatch - pop bc - pop bc - and a - ret - -.BoxBankAddresses: ; 4d99f - dba sBox1 - dba sBox2 - dba sBox3 - dba sBox4 - dba sBox5 - dba sBox6 - dba sBox7 - dba sBox8 - dba sBox9 - dba sBox10 - dba sBox11 - dba sBox12 - dba sBox13 - dba sBox14 - -.FoundPartymonText: ; 0x4d9c9 - ; Congratulations! We have a match with the ID number of @ in your party. - text_jump UnknownText_0x1c1261 - db "@" - -.FoundBoxmonText: ; 0x4d9ce - ; Congratulations! We have a match with the ID number of @ in your PC BOX. - text_jump UnknownText_0x1c12ae - db "@" - -Special_PrintTodaysLuckyNumber: ; 4d9d3 - ld hl, StringBuffer3 - ld de, wLuckyIDNumber - lb bc, PRINTNUM_LEADINGZEROS | 2, 5 - call PrintNum - ld a, "@" - ld [StringBuffer3 + 5], a - ret - -CheckPartyFullAfterContest: ; 4d9e5 - ld a, [wContestMon] - and a - jp z, .DidntCatchAnything - ld [CurPartySpecies], a - ld [CurSpecies], a - call GetBaseData - ld hl, PartyCount - ld a, [hl] - cp 6 - jp nc, .TryAddToBox - inc a - ld [hl], a - ld c, a - ld b, $0 - add hl, bc - ld a, [wContestMon] - ld [hli], a - ld [CurSpecies], a - ld a, $ff - ld [hl], a - ld hl, PartyMon1Species - ld a, [PartyCount] - dec a - ld bc, PARTYMON_STRUCT_LENGTH - call AddNTimes - ld d, h - ld e, l - ld hl, wContestMon - ld bc, PARTYMON_STRUCT_LENGTH - call CopyBytes - ld a, [PartyCount] - dec a - ld hl, PartyMonOT - call SkipNames - ld d, h - ld e, l - ld hl, PlayerName - call CopyBytes - ld a, [CurPartySpecies] - ld [wd265], a - call GetPokemonName - ld hl, StringBuffer1 - ld de, wMonOrItemNameBuffer - ld bc, PKMN_NAME_LENGTH - call CopyBytes - call GiveANickname_YesNo - jr c, .Party_SkipNickname - ld a, [PartyCount] - dec a - ld [CurPartyMon], a - xor a - ld [MonType], a - ld de, wMonOrItemNameBuffer - callab InitNickname - -.Party_SkipNickname: - ld a, [PartyCount] - dec a - ld hl, PartyMonNicknames - call SkipNames - ld d, h - ld e, l - ld hl, wMonOrItemNameBuffer - call CopyBytes - ld a, [PartyCount] - dec a - ld hl, PartyMon1Level - call GetPartyLocation - ld a, [hl] - ld [CurPartyLevel], a - call SetCaughtData - ld a, [PartyCount] - dec a - ld hl, PartyMon1CaughtLocation - call GetPartyLocation - ld a, [hl] - and $80 - ld b, $13 - or b - ld [hl], a - xor a - ld [wContestMon], a - and a - ld [ScriptVar], a - ret - -.TryAddToBox: ; 4daa3 - ld a, BANK(sBoxCount) - call GetSRAMBank - ld hl, sBoxCount - ld a, [hl] - cp MONS_PER_BOX - call CloseSRAM - jr nc, .BoxFull - xor a - ld [CurPartyMon], a - ld hl, wContestMon - ld de, wBufferMon - ld bc, BOXMON_STRUCT_LENGTH - call CopyBytes - ld hl, PlayerName - ld de, wBufferMonOT - ld bc, NAME_LENGTH - call CopyBytes - callab InsertPokemonIntoBox - ld a, [CurPartySpecies] - ld [wd265], a - call GetPokemonName - call GiveANickname_YesNo - ld hl, StringBuffer1 - jr c, .Box_SkipNickname - ld a, BOXMON - ld [MonType], a - ld de, wMonOrItemNameBuffer - callab InitNickname - ld hl, wMonOrItemNameBuffer - -.Box_SkipNickname: - ld a, BANK(sBoxMonNicknames) - call GetSRAMBank - ld de, sBoxMonNicknames - ld bc, PKMN_NAME_LENGTH - call CopyBytes - call CloseSRAM - -.BoxFull: - ld a, BANK(sBoxMon1Level) - call GetSRAMBank - ld a, [sBoxMon1Level] - ld [CurPartyLevel], a - call CloseSRAM - call SetBoxMonCaughtData - ld a, BANK(sBoxMon1CaughtLocation) - call GetSRAMBank - ld hl, sBoxMon1CaughtLocation - ld a, [hl] - and $80 - ld b, $13 - or b - ld [hl], a - call CloseSRAM - xor a - ld [wContestMon], a - ld a, $1 - ld [ScriptVar], a - ret - -.DidntCatchAnything: ; 4db35 - ld a, $2 - ld [ScriptVar], a - ret - -GiveANickname_YesNo: ; 4db3b - ld hl, TextJump_GiveANickname - call PrintText - jp YesNoBox - -TextJump_GiveANickname: ; 0x4db44 - ; Give a nickname to the @ you received? - text_jump UnknownText_0x1c12fc - db "@" - -SetCaughtData: ; 4db49 - ld a, [PartyCount] - dec a - ld hl, PartyMon1CaughtLevel - call GetPartyLocation -SetBoxmonOrEggmonCaughtData: ; 4db53 - ld a, [TimeOfDay] - inc a - rrca - rrca - ld b, a - ld a, [CurPartyLevel] - or b - ld [hli], a - ld a, [MapGroup] - ld b, a - ld a, [MapNumber] - ld c, a - cp MAP_POKECENTER_2F - jr nz, .NotPokecenter2F - ld a, b - cp GROUP_POKECENTER_2F - jr nz, .NotPokecenter2F - - ld a, [BackupMapGroup] - ld b, a - ld a, [BackupMapNumber] - ld c, a - -.NotPokecenter2F: - call GetWorldMapLocation - ld b, a - ld a, [PlayerGender] - rrca - or b - ld [hl], a - ret - -SetBoxMonCaughtData: ; 4db83 - ld a, BANK(sBoxMon1CaughtLevel) - call GetSRAMBank - ld hl, sBoxMon1CaughtLevel - call SetBoxmonOrEggmonCaughtData - call CloseSRAM - ret - -SetGiftBoxMonCaughtData: ; 4db92 - push bc - ld a, BANK(sBoxMon1CaughtLevel) - call GetSRAMBank - ld hl, sBoxMon1CaughtLevel - pop bc - call SetGiftMonCaughtData - call CloseSRAM - ret - -SetGiftPartyMonCaughtData: ; 4dba3 - ld a, [PartyCount] - dec a - ld hl, PartyMon1CaughtLevel - push bc - call GetPartyLocation - pop bc -SetGiftMonCaughtData: ; 4dbaf - xor a - ld [hli], a - ld a, $7e - rrc b - or b - ld [hl], a - ret - -SetEggMonCaughtData: ; 4dbb8 (13:5bb8) - ld a, [CurPartyMon] - ld hl, PartyMon1CaughtLevel - call GetPartyLocation - ld a, [CurPartyLevel] - push af - ld a, $1 - ld [CurPartyLevel], a - call SetBoxmonOrEggmonCaughtData - pop af - ld [CurPartyLevel], a - ret - +INCLUDE "event/lucky_number.asm" +INCLUDE "engine/caught_data.asm" INCLUDE "engine/search2.asm" - INCLUDE "engine/stats_screen.asm" - -CatchTutorial:: ; 4e554 - ld a, [BattleType] - dec a - ld c, a - ld hl, .dw - ld b, 0 - add hl, bc - add hl, bc - ld a, [hli] - ld h, [hl] - ld l, a - jp hl - -.dw ; 4e564 (13:6564) - dw .DudeTutorial - dw .DudeTutorial - dw .DudeTutorial - -.DudeTutorial: ; 4e56a (13:656a) -; Back up your name to your Mom's name. - ld hl, PlayerName - ld de, MomsName - ld bc, NAME_LENGTH - call CopyBytes -; Copy Dude's name to your name - ld hl, .Dude - ld de, PlayerName - ld bc, NAME_LENGTH - call CopyBytes - - call .LoadDudeData - - xor a - ld [hJoyDown], a - ld [hJoyPressed], a - ld a, [Options] - push af - and $f8 - add $3 - ld [Options], a - ld hl, .AutoInput - ld a, BANK(.AutoInput) - call StartAutoInput - callab StartBattle - call StopAutoInput - pop af - - ld [Options], a - ld hl, MomsName - ld de, PlayerName - ld bc, NAME_LENGTH - call CopyBytes - ret - -.LoadDudeData: ; 4e5b7 (13:65b7) - ld hl, wDudeNumItems - ld [hl], 1 - inc hl - ld [hl], POTION - inc hl - ld [hl], 1 - inc hl - ld [hl], -1 - ld hl, wDudeNumKeyItems - ld [hl], 0 - inc hl - ld [hl], -1 - ld hl, wDudeNumBalls - ld a, 1 - ld [hli], a - ld a, POKE_BALL ; 5 - ld [hli], a - ld [hli], a - ld [hl], -1 - ret - -.Dude: ; 4e5da - db "DUDE@" - -.AutoInput: ; 4e5df - db NO_INPUT, $ff ; end - +INCLUDE "event/catch_tutorial.asm" INCLUDE "engine/evolution_animation.asm" - -InitDisplayForHallOfFame: ; 4e881 - call ClearBGPalettes - call ClearTileMap - call ClearSprites - call DisableLCD - call LoadStandardFont - call LoadFontsBattleExtra - hlbgcoord 0, 0 - ld bc, VBGMap1 - VBGMap0 - ld a, " " - call ByteFill - hlcoord 0, 0, AttrMap - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT - xor a - call ByteFill - xor a - ld [hSCY], a - ld [hSCX], a - call EnableLCD - ld hl, .SavingRecordDontTurnOff - call PrintText - call WaitBGMap2 - call SetPalettes - ret - -.SavingRecordDontTurnOff: ; 0x4e8bd - ; SAVING RECORD… DON'T TURN OFF! - text_jump UnknownText_0x1bd39e - db "@" - -InitDisplayForRedCredits: ; 4e8c2 - call ClearBGPalettes - call ClearTileMap - call ClearSprites - call DisableLCD - call LoadStandardFont - call LoadFontsBattleExtra - hlbgcoord 0, 0 - ld bc, VBGMap1 - VBGMap0 - ld a, " " - call ByteFill - hlcoord 0, 0, AttrMap - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT - xor a - call ByteFill - ld hl, UnknBGPals - ld c, 4 tiles -.load_white_palettes - ld a, (palred 31 + palgreen 31 + palblue 31) % $100 - ld [hli], a - ld a, (palred 31 + palgreen 31 + palblue 31) / $100 - ld [hli], a - dec c - jr nz, .load_white_palettes - xor a - ld [hSCY], a - ld [hSCX], a - call EnableLCD - call WaitBGMap2 - call SetPalettes - ret - -ResetDisplayBetweenHallOfFameMons: ; 4e906 - ld a, [rSVBK] - push af - ld a, $6 - ld [rSVBK], a - ld hl, wDecompressScratch - ld bc, wScratchAttrMap - wDecompressScratch - ld a, " " - call ByteFill - hlbgcoord 0, 0 - ld de, wDecompressScratch - ld b, 0 - ld c, 4 tiles - call Request2bpp - pop af - ld [rSVBK], a - ret - -GetMobileOTTrainerClass: ; mobile function - ld h, b - ld l, c - call .GetMobileOTTrainerClass - ld c, a - ret - -.GetMobileOTTrainerClass: ; 4e930 - ld a, [hli] - xor [hl] - ld c, a - jr z, .skip_male_trainers - srl c - srl c -.male_trainer_loop - srl c - ld a, c - cp MaleTrainersEnd - MaleTrainers - 1 - jr nc, .male_trainer_loop - inc c - -.skip_male_trainers - ld a, [de] - cp $1 - ld hl, MaleTrainers - jr nz, .finished - - ld hl, FemaleTrainers - ld a, c - and a - jr z, .finished - -.female_trainer_loop - srl c - ld a, c - cp FemaleTrainersEnd - FemaleTrainers - 1 - jr nc, .female_trainer_loop - inc c - -.finished - ld b, $0 - add hl, bc - ld a, [hl] - ret - -INCLUDE "trainers/gendered_trainers.asm" - +INCLUDE "engine/init_hof_credits.asm" +INCLUDE "mobile/get_trainer_class.asm" INCLUDE "battle/sliding_intro.asm" - -Mobile_PrintOpponentBattleMessage: ; 4ea0a - ld a, c - push af - call SpeechTextBox - call MobileTextBorder - pop af - dec a - ld bc, $c - ld hl, w5_MobileOpponentBattleMessages - call AddNTimes - ld de, wMobileOpponentBattleMessage - ld bc, $c - ld a, $5 ; BANK(w5_MobileOpponentBattleMessages) - call FarCopyWRAM - - ld a, [rSVBK] - push af - ld a, $1 - ld [rSVBK], a - - ld bc, wMobileOpponentBattleMessage - decoord 1, 14 - callba PrintEZChatBattleMessage - - pop af - ld [rSVBK], a - - ld c, 180 - call DelayFrames - ret - -CheckBattleScene: ; 4ea44 -; Return carry if battle scene is turned off. - - ld a, 0 - ld hl, wLinkMode - call GetFarWRAMByte - cp LINK_MOBILE - jr z, .mobile - - ld a, [Options] - bit BATTLE_SCENE, a - jr nz, .off - - and a - ret - -.mobile - ld a, [wcd2f] - and a - jr nz, .from_wram - - ld a, $4 - call GetSRAMBank - ld a, [$a60c] - ld c, a - call CloseSRAM - - ld a, c - bit 0, c - jr z, .off - - and a - ret - -.from_wram - ld a, $5 - ld hl, w5_dc00 - call GetFarWRAMByte - bit 0, a - jr z, .off - - and a - ret - -.off - scf - ret - -INCLUDE "misc/gbc_only.asm" - +INCLUDE "mobile/print_opp_message.asm" +INCLUDE "engine/check_battle_scene.asm" +INCLUDE "engine/gbc_only.asm" INCLUDE "event/poke_seer.asm" @@ -3205,1088 +681,17 @@ INCLUDE "event/squirtbottle.asm" INCLUDE "event/card_key.asm" INCLUDE "event/basement_key.asm" INCLUDE "event/sacred_ash.asm" - -CopyPkmnToTempMon: ; 5084a -; gets the BaseData of a Pkmn -; and copys the PkmnStructure to TempMon - - ld a, [CurPartyMon] - ld e, a - call GetPkmnSpecies - ld a, [CurPartySpecies] - ld [CurSpecies], a - call GetBaseData - - ld a, [MonType] - ld hl, PartyMon1Species - ld bc, PARTYMON_STRUCT_LENGTH - and a - jr z, .copywholestruct - ld hl, OTPartyMon1Species - ld bc, PARTYMON_STRUCT_LENGTH - cp OTPARTYMON - jr z, .copywholestruct - ld bc, BOXMON_STRUCT_LENGTH - callab CopyBoxmonToTempMon - jr .done - -.copywholestruct - ld a, [CurPartyMon] - call AddNTimes - ld de, TempMon - ld bc, PARTYMON_STRUCT_LENGTH - call CopyBytes - -.done - ret - -CalcwBufferMonStats: ; 5088b - ld bc, wBufferMon - jr _TempMonStatsCalculation - -CalcTempmonStats: ; 50890 - ld bc, TempMon -_TempMonStatsCalculation: ; 50893 - ld hl, MON_LEVEL - add hl, bc - ld a, [hl] - ld [CurPartyLevel], a - ld hl, MON_MAXHP - add hl, bc - ld d, h - ld e, l - ld hl, MON_STAT_EXP - 1 - add hl, bc - push bc - ld b, $1 - predef CalcPkmnStats - pop bc - ld hl, MON_HP - add hl, bc - ld d, h - ld e, l - ld a, [CurPartySpecies] - cp EGG - jr nz, .not_egg - xor a - ld [de], a - inc de - ld [de], a - jr .zero_status - -.not_egg - push bc - ld hl, MON_MAXHP - add hl, bc - ld bc, 2 - call CopyBytes - pop bc - -.zero_status - ld hl, MON_STATUS - add hl, bc - xor a - ld [hli], a - ld [hl], a - ret - -GetPkmnSpecies: ; 508d5 -; [MonType] has the type of the Pkmn -; e = Nr. of Pkmn (i.e. [CurPartyMon]) - - ld a, [MonType] - and a ; PARTYMON - jr z, .partymon - cp OTPARTYMON - jr z, .otpartymon - cp BOXMON - jr z, .boxmon - cp TEMPMON - jr z, .breedmon - ; WILDMON - -.partymon - ld hl, PartySpecies - jr .done - -.otpartymon - ld hl, OTPartySpecies - jr .done - -.boxmon - ld a, BANK(sBoxSpecies) - call GetSRAMBank - ld hl, sBoxSpecies - call .done - call CloseSRAM - ret - -.breedmon - ld a, [wBreedMon1Species] - jr .done2 - -.done - ld d, 0 - add hl, de - ld a, [hl] - -.done2 - ld [CurPartySpecies], a - ret - +INCLUDE "engine/tempmon.asm" INCLUDE "text/types.asm" - -Function50a28: ; 50a28 -; XXX - ld hl, .Strings - ld a, [TrainerClass] - dec a - ld c, a - ld b, 0 - add hl, bc - add hl, bc - ld a, [hli] - ld h, [hl] - ld l, a - ld de, StringBuffer1 -.copy - ld a, [hli] - ld [de], a - inc de - cp "@" - jr nz, .copy - ret - -.Strings: ; 50a42 -; Untranslated trainer class names from Red. - dw .Youngster - dw .BugCatcher - dw .Lass - dw OTClassName - dw .JrTrainerM - dw .JrTrainerF - dw .Pokemaniac - dw .SuperNerd - dw OTClassName - dw OTClassName - dw .Burglar - dw .Engineer - dw .Jack - dw OTClassName - dw .Swimmer - dw OTClassName - dw OTClassName - dw .Beauty - dw OTClassName - dw .Rocker - dw .Juggler - dw OTClassName - dw OTClassName - dw .Blackbelt - dw OTClassName - dw .ProfOak - dw .Chief - dw .Scientist - dw OTClassName - dw .Rocket - dw .CooltrainerM - dw .CooltrainerF - dw OTClassName - dw OTClassName - dw OTClassName - dw OTClassName - dw OTClassName - dw OTClassName - dw OTClassName - dw OTClassName - dw OTClassName - dw OTClassName - dw OTClassName - dw OTClassName - dw OTClassName - dw OTClassName - dw OTClassName - -.Youngster: db "たんパン@" -.BugCatcher: db "むしとり@" -.Lass: db "ミニスカ@" -.JrTrainerM: db "ボーイ@" -.JrTrainerF: db "ガール@" -.Pokemaniac: db "マニア@" -.SuperNerd: db "りかけい@" -.Burglar: db "どろぼう@" -.Engineer: db "ォヤジ@" -.Jack: db "ジャック@" -.Swimmer: db "かいパン@" -.Beauty: db "おねえさん@" -.Rocker: db "グループ@" -.Juggler: db "ジャグラー@" -.Blackbelt: db "からて@" -.ProfOak: db "ォーキド@" -.Chief: db "チーフ@" -.Scientist: db "けんきゅういん@" -.Rocket: db "だんいん@" -.CooltrainerM: db "エりート♂@" -.CooltrainerF: db "エりート♀@" - -DrawPlayerHP: ; 50b0a - ld a, $1 - jr DrawHP - -DrawEnemyHP: ; 50b0e - ld a, $2 - -DrawHP: ; 50b10 - ld [wWhichHPBar], a - push hl - push bc - ; box mons have full HP - ld a, [MonType] - cp BOXMON - jr z, .at_least_1_hp - - ld a, [TempMonHP] - ld b, a - ld a, [TempMonHP + 1] - ld c, a - -; Any HP? - or b - jr nz, .at_least_1_hp - - xor a - ld c, a - ld e, a - ld a, 6 - ld d, a - jp .fainted - -.at_least_1_hp - ld a, [TempMonMaxHP] - ld d, a - ld a, [TempMonMaxHP + 1] - ld e, a - ld a, [MonType] - cp BOXMON - jr nz, .not_boxmon - - ld b, d - ld c, e - -.not_boxmon - predef ComputeHPBarPixels - ld a, 6 - ld d, a - ld c, a - -.fainted - ld a, c - pop bc - ld c, a - pop hl - push de - push hl - push hl - call DrawBattleHPBar - pop hl - -; Print HP - bccoord 1, 1, 0 - add hl, bc - ld de, TempMonHP - ld a, [MonType] - cp BOXMON - jr nz, .not_boxmon_2 - ld de, TempMonMaxHP -.not_boxmon_2 - lb bc, 2, 3 - call PrintNum - - ld a, "/" - ld [hli], a - -; Print max HP - ld de, TempMonMaxHP - lb bc, 2, 3 - call PrintNum - pop hl - pop de - ret - -PrintTempMonStats: ; 50b7b -; Print TempMon's stats at hl, with spacing bc. - push bc - push hl - ld de, .StatNames - call PlaceString - pop hl - pop bc - add hl, bc - ld bc, SCREEN_WIDTH - add hl, bc - ld de, TempMonAttack - lb bc, 2, 3 - call .PrintStat - ld de, TempMonDefense - call .PrintStat - ld de, TempMonSpclAtk - call .PrintStat - ld de, TempMonSpclDef - call .PrintStat - ld de, TempMonSpeed - jp PrintNum - -.PrintStat: ; 50bab - push hl - call PrintNum - pop hl - ld de, SCREEN_WIDTH * 2 - add hl, de - ret - -.StatNames: ; 50bb5 - db "ATTACK" - next "DEFENSE" - next "SPCL.ATK" - next "SPCL.DEF" - next "SPEED" - next "@" - -GetGender: ; 50bdd -; Return the gender of a given monster (CurPartyMon/CurOTMon/CurWildMon). -; When calling this function, a should be set to an appropriate MonType value. - -; return values: -; a = 1: f = nc|nz; male -; a = 0: f = nc|z; female -; f = c: genderless - -; This is determined by comparing the Attack and Speed DVs -; with the species' gender ratio. - -; Figure out what type of monster struct we're looking at. - -; 0: PartyMon - ld hl, PartyMon1DVs - ld bc, PARTYMON_STRUCT_LENGTH - ld a, [MonType] - and a - jr z, .PartyMon - -; 1: OTPartyMon - ld hl, OTPartyMon1DVs - dec a - jr z, .PartyMon - -; 2: sBoxMon - ld hl, sBoxMon1DVs - ld bc, BOXMON_STRUCT_LENGTH - dec a - jr z, .sBoxMon - -; 3: Unknown - ld hl, TempMonDVs - dec a - jr z, .DVs - -; else: WildMon - ld hl, EnemyMonDVs - jr .DVs - -; Get our place in the party/box. - -.PartyMon: -.sBoxMon - ld a, [CurPartyMon] - call AddNTimes - -.DVs: - -; sBoxMon data is read directly from SRAM. - ld a, [MonType] - cp BOXMON - ld a, 1 - call z, GetSRAMBank - -; Attack DV - ld a, [hli] - and $f0 - ld b, a -; Speed DV - ld a, [hl] - and $f0 - swap a - -; Put our DVs together. - or b - ld b, a - -; Close SRAM if we were dealing with a sBoxMon. - ld a, [MonType] - cp BOXMON - call z, CloseSRAM - -; We need the gender ratio to do anything with this. - push bc - ld a, [CurPartySpecies] - dec a - ld hl, BaseData + BASE_GENDER - ld bc, BASE_DATA_SIZE - call AddNTimes - pop bc - - ld a, BANK(BaseData) - call GetFarByte - -; The higher the ratio, the more likely the monster is to be female. - - cp $ff - jr z, .Genderless - - and a - jr z, .Male - - cp $fe - jr z, .Female - -; Values below the ratio are male, and vice versa. - cp b - jr c, .Male - -.Female: - xor a - ret - -.Male: - ld a, 1 - and a - ret - -.Genderless: - scf - ret - -ListMovePP: ; 50c50 - ld a, [wNumMoves] - inc a - ld c, a - ld a, NUM_MOVES - sub c - ld b, a - push hl - ld a, [Buffer1] - ld e, a - ld d, $0 - ld a, $3e ; P - call .load_loop - ld a, b - and a - jr z, .skip - ld c, a - ld a, "-" - call .load_loop - -.skip - pop hl - inc hl - inc hl - inc hl - ld d, h - ld e, l - ld hl, TempMonMoves - ld b, 0 -.loop - ld a, [hli] - and a - jr z, .done - push bc - push hl - push de - ld hl, wMenuCursorY - ld a, [hl] - push af - ld [hl], b - push hl - callab GetMaxPPOfMove - pop hl - pop af - ld [hl], a - pop de - pop hl - push hl - ld bc, TempMonPP - (TempMonMoves + 1) - add hl, bc - ld a, [hl] - and $3f - ld [StringBuffer1 + 4], a - ld h, d - ld l, e - push hl - ld de, StringBuffer1 + 4 - lb bc, 1, 2 - call PrintNum - ld a, "/" - ld [hli], a - ld de, wd265 - lb bc, 1, 2 - call PrintNum - pop hl - ld a, [Buffer1] - ld e, a - ld d, 0 - add hl, de - ld d, h - ld e, l - pop hl - pop bc - inc b - ld a, b - cp NUM_MOVES - jr nz, .loop - -.done - ret - -.load_loop ; 50cc9 - ld [hli], a - ld [hld], a - add hl, de - dec c - jr nz, .load_loop - ret - -Function50cd0: ; 50cd0 -; XXX -.loop - ld [hl], $32 - inc hl - ld [hl], $3e - dec hl - add hl, de - dec c - jr nz, .loop - ret - -Predef22: ; unreferenced predef - push hl - push hl - ld hl, PartyMonNicknames - ld a, [CurPartyMon] - call GetNick - pop hl - call PlaceString - call CopyPkmnToTempMon - pop hl - ld a, [CurPartySpecies] - cp EGG - jr z, .egg - push hl - ld bc, -12 - add hl, bc - ld b, $0 - call DrawEnemyHP - pop hl - ld bc, 5 - add hl, bc - push de - call PrintLevel - pop de - -.egg - ret - -PlaceStatusString: ; 50d0a - push de - inc de - inc de - ld a, [de] - ld b, a - inc de - ld a, [de] - or b - pop de - jr nz, PlaceNonFaintStatus - push de - ld de, FntString - call CopyStatusString - pop de - ld a, $1 - and a - ret - -FntString: ; 50d22 - db "FNT@" - -CopyStatusString: ; 50d25 - ld a, [de] - inc de - ld [hli], a - ld a, [de] - inc de - ld [hli], a - ld a, [de] - ld [hl], a - ret - -PlaceNonFaintStatus: ; 50d2e - push de - ld a, [de] - ld de, PsnString - bit PSN, a - jr nz, .place - ld de, BrnString - bit BRN, a - jr nz, .place - ld de, FrzString - bit FRZ, a - jr nz, .place - ld de, ParString - bit PAR, a - jr nz, .place - ld de, SlpString - and SLP - jr z, .no_status - -.place - call CopyStatusString - ld a, $1 - and a - -.no_status - pop de - ret - -SlpString: db "SLP@" -PsnString: db "PSN@" -BrnString: db "BRN@" -FrzString: db "FRZ@" -ParString: db "PAR@" - -ListMoves: ; 50d6f -; List moves at hl, spaced every [Buffer1] tiles. - ld de, wListMoves_MoveIndicesBuffer - ld b, $0 -.moves_loop - ld a, [de] - inc de - and a - jr z, .no_more_moves - push de - push hl - push hl - ld [CurSpecies], a - ld a, MOVE_NAME - ld [wNamedObjectTypeBuffer], a - call GetName - ld de, StringBuffer1 - pop hl - push bc - call PlaceString - pop bc - ld a, b - ld [wNumMoves], a - inc b - pop hl - push bc - ld a, [Buffer1] - ld c, a - ld b, 0 - add hl, bc - pop bc - pop de - ld a, b - cp NUM_MOVES - jr z, .done - jr .moves_loop - -.no_more_moves - ld a, b -.nonmove_loop - push af - ld [hl], "-" - ld a, [Buffer1] - ld c, a - ld b, 0 - add hl, bc - pop af - inc a - cp NUM_MOVES - jr nz, .nonmove_loop - -.done - ret - -InitList: ; 50db9 - ld a, [wInitListType] - - cp INIT_ENEMYOT_LIST - jr nz, .check_party_ot_name - ld hl, OTPartyCount - ld de, OTPartyMonOT - ld a, ENEMY_OT_NAME - jr .done - -.check_party_ot_name - cp INIT_PLAYEROT_LIST - jr nz, .check_mon_name - ld hl, PartyCount - ld de, PartyMonOT - ld a, PARTY_OT_NAME - jr .done - -.check_mon_name - cp INIT_MON_LIST - jr nz, .check_item_name - ld hl, CurMart - ld de, PokemonNames - ld a, PKMN_NAME - jr .done - -.check_item_name - cp INIT_BAG_ITEM_LIST - jr nz, .check_ob_item_name - ld hl, NumItems - ld de, ItemNames - ld a, ITEM_NAME - jr .done - -.check_ob_item_name - ld hl, CurMart - ld de, ItemNames - ld a, ITEM_NAME -.done - ld [wNamedObjectTypeBuffer], a ; d265 - ld a, l - ld [wListPointer], a - ld a, h - ld [wListPointer + 1], a - ld a, e - ld [wUnusedD102], a - ld a, d - ld [wUnusedD102 + 1], a - ld bc, ItemAttributes ; ParseEnemyAction, HandleMapTimeAndJoypad, Music_LakeOfRage_Ch3, String_11a7c1 $67c1 - ld a, c - ld [wItemAttributesPtr], a - ld a, b - ld [wItemAttributesPtr + 1], a - ret - -CalcLevel: ; 50e1b - ld a, [TempMonSpecies] - ld [CurSpecies], a - call GetBaseData - ld d, 1 -.next_level - inc d - ld a, d - cp (MAX_LEVEL + 1) % $100 - jr z, .got_level - call CalcExpAtLevel - push hl - ld hl, TempMonExp + 2 - ld a, [hProduct + 3] - ld c, a - ld a, [hld] - sub c - ld a, [hProduct + 2] - ld c, a - ld a, [hld] - sbc c - ld a, [hProduct + 1] - ld c, a - ld a, [hl] - sbc c - pop hl - jr nc, .next_level - -.got_level - dec d - ret - -CalcExpAtLevel: ; 50e47 -; (a/b)*n**3 + c*n**2 + d*n - e - ld a, [BaseGrowthRate] - add a - add a - ld c, a - ld b, 0 - ld hl, GrowthRates - add hl, bc -; Cube the level - call .LevelSquared - ld a, d - ld [hMultiplier], a - call Multiply - -; Multiply by a - ld a, [hl] - and $f0 - swap a - ld [hMultiplier], a - call Multiply -; Divide by b - ld a, [hli] - and $f - ld [hDivisor], a - ld b, 4 - call Divide -; Push the cubic term to the stack - ld a, [hQuotient + 0] - push af - ld a, [hQuotient + 1] - push af - ld a, [hQuotient + 2] - push af -; Square the level and multiply by the lower 7 bits of c - call .LevelSquared - ld a, [hl] - and $7f - ld [hMultiplier], a - call Multiply -; Push the absolute value of the quadratic term to the stack - ld a, [hProduct + 1] - push af - ld a, [hProduct + 2] - push af - ld a, [hProduct + 3] - push af - ld a, [hli] - push af -; Multiply the level by d - xor a - ld [hMultiplicand + 0], a - ld [hMultiplicand + 1], a - ld a, d - ld [hMultiplicand + 2], a - ld a, [hli] - ld [hMultiplier], a - call Multiply -; Subtract e - ld b, [hl] - ld a, [hProduct + 3] - sub b - ld [hMultiplicand + 2], a - ld b, $0 - ld a, [hProduct + 2] - sbc b - ld [hMultiplicand + 1], a - ld a, [hProduct + 1] - sbc b - ld [hMultiplicand], a -; If bit 7 of c is set, c is negative; otherwise, it's positive - pop af - and $80 - jr nz, .subtract -; Add c*n**2 to (d*n - e) - pop bc - ld a, [hProduct + 3] - add b - ld [hMultiplicand + 2], a - pop bc - ld a, [hProduct + 2] - adc b - ld [hMultiplicand + 1], a - pop bc - ld a, [hProduct + 1] - adc b - ld [hMultiplicand], a - jr .done_quadratic - -.subtract -; Subtract c*n**2 from (d*n - e) - pop bc - ld a, [hProduct + 3] - sub b - ld [hMultiplicand + 2], a - pop bc - ld a, [hProduct + 2] - sbc b - ld [hMultiplicand + 1], a - pop bc - ld a, [hProduct + 1] - sbc b - ld [hMultiplicand], a - -.done_quadratic -; Add (a/b)*n**3 to (d*n - e +/- c*n**2) - pop bc - ld a, [hProduct + 3] - add b - ld [hMultiplicand + 2], a - pop bc - ld a, [hProduct + 2] - adc b - ld [hMultiplicand + 1], a - pop bc - ld a, [hProduct + 1] - adc b - ld [hMultiplicand], a - ret - -.LevelSquared: ; 50eed - xor a - ld [hMultiplicand + 0], a - ld [hMultiplicand + 1], a - ld a, d - ld [hMultiplicand + 2], a - ld [hMultiplier], a - jp Multiply - -INCLUDE "data/growth_rates.asm" - -_SwitchPartyMons: - ld a, [wd0e3] - dec a - ld [Buffer3], a - ld b, a - ld a, [wMenuCursorY] - dec a - ld [Buffer2], a - cp b - jr z, .skip - call .SwapMonAndMail - ld a, [Buffer3] - call .ClearSprite - ld a, [Buffer2] - call .ClearSprite -.skip - ret - -.ClearSprite: ; 50f34 (14:4f34) - push af - hlcoord 0, 1 - ld bc, 2 * SCREEN_WIDTH - call AddNTimes - ld bc, 2 * SCREEN_WIDTH - ld a, " " - call ByteFill - pop af - ld hl, Sprites - ld bc, $10 - call AddNTimes - ld de, $4 - ld c, $4 -.gfx_loop - ld [hl], $a0 - add hl, de - dec c - jr nz, .gfx_loop - ld de, SFX_SWITCH_POKEMON - call WaitPlaySFX - ret - -.SwapMonAndMail: ; 50f62 (14:4f62) - push hl - push de - push bc - ld bc, PartySpecies - ld a, [Buffer2] - ld l, a - ld h, $0 - add hl, bc - ld d, h - ld e, l - ld a, [Buffer3] - ld l, a - ld h, $0 - add hl, bc - ld a, [hl] - push af - ld a, [de] - ld [hl], a - pop af - ld [de], a - ld a, [Buffer2] - ld hl, PartyMon1Species - ld bc, PARTYMON_STRUCT_LENGTH - call AddNTimes - push hl - ld de, wd002 - ld bc, PARTYMON_STRUCT_LENGTH - call CopyBytes - ld a, [Buffer3] - ld hl, PartyMon1 - ld bc, PARTYMON_STRUCT_LENGTH - call AddNTimes - pop de - push hl - ld bc, PARTYMON_STRUCT_LENGTH - call CopyBytes - pop de - ld hl, wd002 - ld bc, PARTYMON_STRUCT_LENGTH - call CopyBytes - ld a, [Buffer2] - ld hl, PartyMonOT - call SkipNames - push hl - call .CopyNameTowd002 - ld a, [Buffer3] - ld hl, PartyMonOT - call SkipNames - pop de - push hl - call .CopyName - pop de - ld hl, wd002 - call .CopyName - ld hl, PartyMonNicknames - ld a, [Buffer2] - call SkipNames - push hl - call .CopyNameTowd002 - ld hl, PartyMonNicknames - ld a, [Buffer3] - call SkipNames - pop de - push hl - call .CopyName - pop de - ld hl, wd002 - call .CopyName - ld hl, sPartyMail - ld a, [Buffer2] - ld bc, MAIL_STRUCT_LENGTH - call AddNTimes - push hl - ld de, wd002 - ld bc, MAIL_STRUCT_LENGTH - ld a, BANK(sPartyMail) - call GetSRAMBank - call CopyBytes - ld hl, sPartyMail - ld a, [Buffer3] - ld bc, MAIL_STRUCT_LENGTH - call AddNTimes - pop de - push hl - ld bc, MAIL_STRUCT_LENGTH - call CopyBytes - pop de - ld hl, wd002 - ld bc, MAIL_STRUCT_LENGTH - call CopyBytes - call CloseSRAM - pop bc - pop de - pop hl - ret - -.CopyNameTowd002: ; 51036 (14:5036) - ld de, wd002 - -.CopyName: ; 51039 (14:5039) - ld bc, NAME_LENGTH - call CopyBytes - ret - +INCLUDE "text/unused_gen_1_trainers.asm" +INCLUDE "engine/mon_stats.asm" +INCLUDE "engine/init_list.asm" +INCLUDE "engine/experience.asm" +INCLUDE "engine/switch_party_mons.asm" INCLUDE "gfx/load_pics.asm" - INCLUDE "engine/move_mon_wo_mail.asm" - -INCLUDE "data/base_stats.asm" - -INCLUDE "data/pokemon_names.asm" +INCLUDE "data/pokemon/base_stats.asm" +INCLUDE "data/pokemon/pokemon_names.asm" Unknown_53d84: ; unreferenced db $1a, $15 @@ -4331,300 +736,19 @@ INCLUDE "event/halloffame.asm" SECTION "bank22", ROMX INCLUDE "event/kurt.asm" - -Function88248: ; 88248 -; XXX - ld c, CAL - ld a, [PlayerGender] - bit 0, a - jr z, .okay - ld c, KAREN - -.okay - ld a, c - ld [TrainerClass], a - ret - -MovePlayerPicRight: ; 88258 - hlcoord 6, 4 - ld de, 1 - jr MovePlayerPic - -MovePlayerPicLeft: ; 88260 - hlcoord 13, 4 - ld de, -1 - ; fallthrough - -MovePlayerPic: ; 88266 -; Move player pic at hl by de * 7 tiles. - ld c, $8 -.loop - push bc - push hl - push de - xor a - ld [hBGMapMode], a - lb bc, 7, 7 - predef PlaceGraphic - xor a - ld [hBGMapThird], a - call WaitBGMap - call DelayFrame - pop de - pop hl - add hl, de - pop bc - dec c - ret z - push hl - push bc - ld a, l - sub e - ld l, a - ld a, h - sbc d - ld h, a - lb bc, 7, 7 - call ClearBox - pop bc - pop hl - jr .loop - -ShowPlayerNamingChoices: ; 88297 - ld hl, ChrisNameMenuHeader - ld a, [PlayerGender] - bit 0, a - jr z, .GotGender - ld hl, KrisNameMenuHeader -.GotGender: - call LoadMenuDataHeader - call VerticalMenu - ld a, [wMenuCursorY] - dec a - call CopyNameFromMenu - 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 - -GetPlayerNameArray: ; 88318 This Function is never called - ld hl, PlayerName - ld de, MalePlayerNameArray - ld a, [PlayerGender] - bit 0, a - jr z, .done - ld de, FemalePlayerNameArray - -.done - call InitName - ret - -GetPlayerIcon: ; 8832c -; Get the player icon corresponding to gender - -; Male - ld de, ChrisSpriteGFX - ld b, BANK(ChrisSpriteGFX) - - ld a, [PlayerGender] - bit 0, a - jr z, .done - -; Female - ld de, KrisSpriteGFX - ld b, BANK(KrisSpriteGFX) - -.done - ret - -GetCardPic: ; 8833e - ld hl, ChrisCardPic - ld a, [PlayerGender] - bit 0, a - jr z, .GotClass - ld hl, KrisCardPic -.GotClass: - ld de, VTiles2 tile $00 - ld bc, $23 tiles - ld a, BANK(ChrisCardPic) ; BANK(KrisCardPic) - call FarCopyBytes - ld hl, CardGFX - ld de, VTiles2 tile $23 - ld bc, 6 tiles - ld a, BANK(CardGFX) - call FarCopyBytes - ret - -ChrisCardPic: ; 88365 -INCBIN "gfx/trainer_card/chris_card.2bpp" - -KrisCardPic: ; 88595 -INCBIN "gfx/trainer_card/kris_card.2bpp" - -CardGFX: ; 887c5 -INCBIN "gfx/trainer_card/trainer_card.2bpp" - -GetPlayerBackpic: ; 88825 - ld a, [PlayerGender] - bit 0, a - jr z, GetChrisBackpic - call GetKrisBackpic - ret - -GetChrisBackpic: ; 88830 - ld hl, ChrisBackpic - ld b, BANK(ChrisBackpic) - ld de, VTiles2 tile $31 - ld c, 7 * 7 - predef DecompressPredef - ret - -HOF_LoadTrainerFrontpic: ; 88840 - call WaitBGMap - xor a - ld [hBGMapMode], a - ld e, 0 - ld a, [PlayerGender] - bit 0, a - jr z, .GotClass - ld e, 1 - -.GotClass: - ld a, e - ld [TrainerClass], a - ld de, ChrisPic - ld a, [PlayerGender] - bit 0, a - jr z, .GotPic - ld de, KrisPic - -.GotPic: - ld hl, VTiles2 - ld b, BANK(ChrisPic) ; BANK(KrisPic) - ld c, 7 * 7 - call Get2bpp - call WaitBGMap - ld a, $1 - ld [hBGMapMode], a - ret - -DrawIntroPlayerPic: ; 88874 -; Draw the player pic at (6,4). - -; Get class - ld e, CHRIS - ld a, [PlayerGender] - bit 0, a - jr z, .GotClass - ld e, KRIS -.GotClass: - ld a, e - ld [TrainerClass], a - -; Load pic - ld de, ChrisPic - ld a, [PlayerGender] - bit 0, a - jr z, .GotPic - ld de, KrisPic -.GotPic: - ld hl, VTiles2 - ld b, BANK(ChrisPic) ; BANK(KrisPic) - ld c, 7 * 7 ; dimensions - call Get2bpp - -; Draw - xor a - ld [hGraphicStartTile], a - hlcoord 6, 4 - lb bc, 7, 7 - predef PlaceGraphic - ret - -ChrisPic: ; 888a9 -INCBIN "gfx/player/chris.2bpp" - -KrisPic: ; 88bb9 -INCBIN "gfx/player/kris.2bpp" - -GetKrisBackpic: ; 88ec9 -; Kris's backpic is uncompressed. - ld de, KrisBackpic - ld hl, VTiles2 tile $31 - lb bc, BANK(KrisBackpic), 7 * 7 ; dimensions - call Get2bpp - ret - -KrisBackpic: ; 88ed6 -INCBIN "gfx/player/kris_back.2bpp" - -String_89116: - db "-----@" - -INCLUDE "misc/mobile_22.asm" +INCLUDE "engine/player_gfx.asm" +INCLUDE "mobile/mobile_22.asm" INCLUDE "event/unown.asm" INCLUDE "event/buena.asm" INCLUDE "event/dratini.asm" INCLUDE "event/battle_tower.asm" -INCLUDE "misc/mobile_22_2.asm" +INCLUDE "mobile/mobile_22_2.asm" SECTION "bank23", ROMX -Predef35: ; 8c000 -Predef36: - ret - INCLUDE "engine/timeofdaypals.asm" -INCLUDE "engine/battle_start.asm" - -Function8c7c9: -; XXX - ld a, $1 - ld [hBGMapMode], a - call WaitBGMap - xor a - ld [hBGMapMode], a - ret - +INCLUDE "engine/battle_transition.asm" INCLUDE "event/field_moves.asm" INCLUDE "event/magnet_train.asm" @@ -4685,95 +809,14 @@ SECTION "bank2F", ROMX INCLUDE "engine/std_scripts.asm" INCLUDE "engine/phone/phone_scripts.asm" INCLUDE "engine/phone/generic_calls.asm" - -TalkToTrainerScript:: ; 0xbe66a - faceplayer - trainerflagaction CHECK_FLAG - iftrue AlreadyBeatenTrainerScript - loadmemtrainer - encountermusic - jump StartBattleWithMapTrainerScript - -SeenByTrainerScript:: ; 0xbe675 - loadmemtrainer - encountermusic - showemote EMOTE_SHOCK, LAST_TALKED, 30 - callasm TrainerWalkToPlayer - applymovement2 MovementBuffer - writepersonxy LAST_TALKED - faceperson PLAYER, LAST_TALKED - jump StartBattleWithMapTrainerScript - -StartBattleWithMapTrainerScript: ; 0xbe68a - opentext - trainertext $0 - waitbutton - closetext - loadmemtrainer - startbattle - reloadmapafterbattle - trainerflagaction SET_FLAG - loadvar wRunningTrainerBattleScript, -1 - -AlreadyBeatenTrainerScript: - scripttalkafter - -INCLUDE "gfx/sprites.asm" +INCLUDE "engine/trainer_scripts.asm" SECTION "bank32", ROMX INCLUDE "battle/bg_effects.asm" INCLUDE "battle/anims.asm" - -LoadPoisonBGPals: ; cbcdd - call .LoadPals - ld a, [hCGB] - and a - ret nz - ret ; ???? - -.LoadPals: ; cbce5 - ld a, [hCGB] - and a - jr nz, .cgb - ld a, [TimeOfDayPal] - and $3 - cp $3 - ld a, %00000000 - jr z, .convert_pals - ld a, %10101010 - -.convert_pals - call DmgToCgbBGPals - ld c, 4 - call DelayFrames - callba _UpdateTimePals - ret - -.cgb - ld a, [rSVBK] - push af - ld a, $5 - ld [rSVBK], a - ld hl, BGPals - ld c, $20 -.loop -; RGB 28, 21, 31 - ld a, (palred 28 + palgreen 21 + palblue 31) % $100 - ld [hli], a - ld a, (palred 28 + palgreen 21 + palblue 31) / $100 - ld [hli], a - dec c - jr nz, .loop - pop af - ld [rSVBK], a - ld a, $1 - ld [hCGBPalUpdate], a - ld c, 4 - call DelayFrames - callba _UpdateTimePals - ret +INCLUDE "event/poisonstep_pals.asm" TheEndGFX:: ; cbd2e INCBIN "gfx/credits/theend.2bpp" @@ -4781,114 +824,7 @@ INCBIN "gfx/credits/theend.2bpp" SECTION "bank33", ROMX -DisplayCaughtContestMonStats: ; cc000 - call ClearBGPalettes - call ClearTileMap - call ClearSprites - call LoadFontsBattleExtra - - ld hl, Options - ld a, [hl] - push af - set 4, [hl] - - hlcoord 0, 0 - ld b, 4 - ld c, 13 - call TextBox - - hlcoord 0, 6 - ld b, 4 - ld c, 13 - call TextBox - - hlcoord 2, 0 - ld de, .Stock - call PlaceString - - hlcoord 2, 6 - ld de, .This - call PlaceString - - hlcoord 5, 4 - ld de, .Health - call PlaceString - - hlcoord 5, 10 - ld de, .Health - call PlaceString - - ld a, [wContestMon] - ld [wd265], a - call GetPokemonName - ld de, StringBuffer1 - hlcoord 1, 2 - call PlaceString - - ld h, b - ld l, c - ld a, [wContestMonLevel] - ld [TempMonLevel], a - call PrintLevel - - ld de, EnemyMonNick - hlcoord 1, 8 - call PlaceString - - ld h, b - ld l, c - ld a, [EnemyMonLevel] - ld [TempMonLevel], a - call PrintLevel - - hlcoord 11, 4 - ld de, wContestMonMaxHP - lb bc, 2, 3 - call PrintNum - - hlcoord 11, 10 - ld de, EnemyMonMaxHP - call PrintNum - - ld hl, SwitchMonText - call PrintText - - pop af - ld [Options], a - - call WaitBGMap - ld b, SCGB_DIPLOMA - call GetSGBLayout - call SetPalettes - ret - -.Health: - db "HEALTH@" -.Stock: - db " STOCK ", $4a, " @" -.This: - db " THIS ", $4a, " @" - -SwitchMonText: ; cc0c2 - ; Switch #MON? - text_jump UnknownText_0x1c10cf - db "@" - -DisplayAlreadyCaughtText: ; cc0c7 - call GetPokemonName - ld hl, .AlreadyCaughtText - jp PrintText - -.AlreadyCaughtText: ; 0xcc0d0 - ; You already caught a @ . - text_jump UnknownText_0x1c10dd - db "@" - -Predef2F: -Predef38: -Predef39: ; cc0d5 - ret - +INCLUDE "event/bug_contest/display_stats.asm" INCLUDE "battle/anim_commands.asm" INCLUDE "battle/anim_objects.asm" @@ -4931,117 +867,7 @@ INCLUDE "gfx/pics/unown_frames.asm" SECTION "bank38", ROMX -RotateUnownFrontpic: ; e0000 -; something to do with Unown printer - push de - xor a - call GetSRAMBank - ld hl, sScratch - ld bc, 0 -.loop - push bc - push hl - push bc - ld de, wd002 - call .Copy - call .Rotate - ld hl, UnownPrinter_OverworldMapRectangle - pop bc - add hl, bc - add hl, bc - ld a, [hli] - ld e, a - ld d, [hl] - ld hl, wd012 - call .Copy - pop hl - ld bc, $10 - add hl, bc - pop bc - inc c - ld a, c - cp 7 * 7 - jr c, .loop - - ld hl, OverworldMap - ld de, sScratch - ld bc, 7 * 7 tiles - call CopyBytes - pop hl - ld de, sScratch - ld c, 7 * 7 - ld a, [hROMBank] - ld b, a - call Get2bpp - call CloseSRAM - ret - -.Copy: ; e004e - ld c, $10 -.loop_copy - ld a, [hli] - ld [de], a - inc de - dec c - jr nz, .loop_copy - ret - -.Rotate: ; e0057 - ld hl, wd012 - ld e, %10000000 - ld d, 8 -.loop_decompress - push hl - ld hl, wd002 - call .CountSetBit - pop hl - ld a, b - ld [hli], a - push hl - ld hl, wd003 - call .CountSetBit - pop hl - ld a, b - ld [hli], a - srl e - dec d - jr nz, .loop_decompress - ret - -.CountSetBit: ; e0078 - ld b, 0 - ld c, 8 -.loop_count - ld a, [hli] - and e - jr z, .clear - scf - jr .apply - -.clear - and a - -.apply - rr b - inc hl - dec c - jr nz, .loop_count - ret - -overworldmaprect: MACRO -y = 0 -rept \1 -x = \1 * (\2 +- 1) + y -rept \2 - dw OverworldMap tile x -x = x +- \2 -endr -y = y + 1 -endr -endm - -UnownPrinter_OverworldMapRectangle: ; e008b - overworldmaprect 7, 7 +INCLUDE "event/print_unown_2.asm" Unknown_e00ed: ; Graphics for an unused Game Corner @@ -5069,8 +895,12 @@ INCLUDE "engine/crystal_intro.asm" SECTION "bank3E", ROMX INCLUDE "gfx/font.asm" -INCLUDE "engine/time_capsule/conversion.asm" -INCLUDE "engine/unowndex.asm" +INCLUDE "engine/time_capsule.asm" +INCLUDE "event/name_rater.asm" +INCLUDE "engine/play_slow_cry.asm" +INCLUDE "engine/new_pokedex_entry.asm" +INCLUDE "engine/time_capsule_2.asm" +INCLUDE "engine/unown_dex.asm" INCLUDE "event/magikarp.asm" INCLUDE "battle/hidden_power.asm" INCLUDE "battle/misc.asm" @@ -5083,41 +913,23 @@ INCLUDE "engine/npctrade.asm" INCLUDE "event/mom_phone.asm" -SECTION "mobile_40", ROMX - -INCLUDE "misc/mobile_40.asm" +INCLUDE "mobile/mobile_40.asm" SECTION "bank41", ROMX -INCLUDE "misc/gfx_41.asm" - +INCLUDE "engine/dma_transfer.asm" +INCLUDE "gfx/emotes.asm" INCLUDE "engine/warp_connection.asm" -INCLUDE "engine/mysterygift.asm" +INCLUDE "engine/mystery_gift.asm" INCLUDE "battle/used_move_text.asm" -INCLUDE "misc/mobile_41.asm" - -LoadOverworldFont:: ; 106594 - ld de, .font - ld hl, VTiles1 - lb bc, BANK(.font), $80 - call Get2bpp - ld de, .space - ld hl, VTiles2 tile $7f - lb bc, BANK(.space), 1 - call Get2bpp - ret -; 1065ad - -.font -INCBIN "gfx/font/overworld.2bpp" -.space -INCBIN "gfx/font/space.2bpp" +INCLUDE "mobile/mobile_41.asm" +INCLUDE "gfx/overworld_font.asm" SECTION "mobile_42", ROMX -INCLUDE "misc/mobile_42.asm" +INCLUDE "mobile/mobile_42.asm" SECTION "Intro Logo", ROMX @@ -5128,26 +940,30 @@ INCBIN "gfx/intro/logo.2bpp.lz" SECTION "bank43", ROMX -INCLUDE "misc/unused_title.asm" +INCLUDE "engine/unused_title.asm" INCLUDE "engine/title.asm" -INCLUDE "misc/mobile_45.asm" -INCLUDE "misc/mobile_46.asm" + + +INCLUDE "mobile/mobile_45.asm" + + +INCLUDE "mobile/mobile_46.asm" SECTION "battle_tower_47", ROMX -INCLUDE "misc/battle_tower_47.asm" +INCLUDE "mobile/battle_tower_47.asm" SECTION "bank5B", ROMX -INCLUDE "misc/mobile_5b.asm" +INCLUDE "mobile/mobile_5b.asm" INCLUDE "engine/link_trade.asm" SECTION "mobile_5c", ROMX -INCLUDE "misc/mobile_5c.asm" +INCLUDE "mobile/mobile_5c.asm" SECTION "Crystal Phone Text 2", ROMX @@ -5167,7 +983,15 @@ _UpdateBattleHUDs: callba FinishBattleAnim ret -INCLUDE "misc/mobile_5f.asm" + +SECTION "mobile_5e", ROMX + +INCLUDE "mobile/mobile_5e.asm" + + +SECTION "bank5F", ROMX + +INCLUDE "mobile/mobile_5f.asm" SECTION "Common Text 1", ROMX @@ -5196,8 +1020,8 @@ INCLUDE "text/phone/trainers1.asm" SECTION "bank72", ROMX -INCLUDE "items/item_names.asm" -INCLUDE "items/item_descriptions.asm" +INCLUDE "data/items/item_names.asm" +INCLUDE "data/items/item_descriptions.asm" INCLUDE "battle/move_names.asm" INCLUDE "engine/landmarks.asm" @@ -5207,445 +1031,17 @@ SECTION "bank77", ROMX UnownFont: ; 1dc000 INCBIN "gfx/font/unown_font.2bpp" -INCLUDE "misc/printer_77.asm" - -MobileHPIcon: ; 1dc591 -INCBIN "gfx/mobile/hp.1bpp" - -MobileLvIcon: ; 1dc599 -INCBIN "gfx/mobile/lv.1bpp" +INCLUDE "engine/print_party.asm" SECTION "bank77_2", ROMX -Function1dd6a9: ; 1dd6a9 -; XXX - ld a, b - ld b, c - ld c, a - push bc - push de - ld hl, sp+$2 - ld d, h - ld e, l - pop hl - lb bc, PRINTNUM_LEADINGZEROS | 2, 5 - call PrintNum - pop bc - ret - -PrintHoursMins ; 1dd6bb (77:56bb) -; Hours in b, minutes in c - ld a, b - cp 12 - push af - jr c, .AM - jr z, .PM - sub 12 - jr .PM -.AM: - or a - jr nz, .PM - ld a, 12 -.PM: - ld b, a -; Crazy stuff happening with the stack - push bc - ld hl, sp+$1 - push de - push hl - pop de - pop hl - ld [hl], " " - lb bc, 1, 2 - call PrintNum - ld [hl], ":" - inc hl - ld d, h - ld e, l - ld hl, sp+$0 - push de - push hl - pop de - pop hl - lb bc, PRINTNUM_LEADINGZEROS | 1, 2 - call PrintNum - pop bc - ld de, String_AM - pop af - jr c, .place_am_pm - ld de, String_PM -.place_am_pm - inc hl - call PlaceString - ret - -String_AM: db "AM@" ; 1dd6fc -String_PM: db "PM@" ; 1dd6ff - +INCLUDE "engine/printhoursmins.asm" INCLUDE "engine/diploma.asm" - -LoadSGBPokedexGFX: ; 1ddf1c - ld hl, SGBPokedexGFX_LZ - ld de, VTiles2 tile $31 - call Decompress - ret - -LoadSGBPokedexGFX2: ; 1ddf26 (77:5f26) - ld hl, SGBPokedexGFX_LZ - ld de, VTiles2 tile $31 - lb bc, BANK(SGBPokedexGFX_LZ), $3a - call DecompressRequest2bpp - ret - -SGBPokedexGFX_LZ: ; 1ddf33 -INCBIN "gfx/pokedex/sgb.2bpp.lz" - -LoadQuestionMarkPic: ; 1de0d7 - ld hl, .QuestionMarkLZ - ld de, sScratch - call Decompress - ret - -.QuestionMarkLZ: ; 1de0e1 -INCBIN "gfx/pics/questionmark/front.2bpp.lz" - -DrawPokedexListWindow: ; 1de171 (77:6171) - ld a, $32 - hlcoord 0, 17 - ld bc, 12 - call ByteFill - hlcoord 0, 1 - lb bc, 15, 11 - call ClearBox - ld a, $34 - hlcoord 0, 0 - ld bc, 11 - call ByteFill - ld a, $39 - hlcoord 0, 16 - ld bc, 11 - call ByteFill - hlcoord 5, 0 - ld [hl], $3f - hlcoord 5, 16 - ld [hl], $40 - ld a, [wCurrentDexMode] - cp DEXMODE_OLD - jr z, .OldMode -; scroll bar - hlcoord 11, 0 - ld [hl], $50 - ld a, $51 - hlcoord 11, 1 - ld b, SCREEN_HEIGHT - 3 - call Bank77_FillColumn - ld [hl], $52 - jr .Done - -.OldMode: -; no scroll bar - hlcoord 11, 0 - ld [hl], $66 - ld a, $67 - hlcoord 11, 1 - ld b, SCREEN_HEIGHT - 3 - call Bank77_FillColumn - ld [hl], $68 -.Done: - ret - -DrawPokedexSearchResultsWindow: ; 1de1d1 (77:61d1) - ld a, $34 - hlcoord 0, 0 - ld bc, 11 - call ByteFill - ld a, $39 - hlcoord 0, 10 - ld bc, 11 - call ByteFill - hlcoord 5, 0 - ld [hl], $3f - hlcoord 5, 10 - ld [hl], $40 - hlcoord 11, 0 - ld [hl], $66 - ld a, $67 - hlcoord 11, 1 - ld b, SCREEN_HEIGHT / 2 - call Bank77_FillColumn - ld [hl], $68 - ld a, $34 - hlcoord 0, 11 - ld bc, 11 - call ByteFill - ld a, $39 - hlcoord 0, 17 - ld bc, 11 - call ByteFill - hlcoord 11, 11 - ld [hl], $66 - ld a, $67 - hlcoord 11, 12 - ld b, 5 - call Bank77_FillColumn - ld [hl], $68 - hlcoord 0, 12 - lb bc, 5, 11 - call ClearBox - ld de, .esults_D - hlcoord 0, 12 - call PlaceString - ret - -.esults_D ; 1de23c -; (SEARCH R) - db "ESULTS" - next "" -; (### FOUN) - next "D!@" - -DrawDexEntryScreenRightEdge: ; 1de247 - ld a, [hBGMapAddress] - ld l, a - ld a, [hBGMapAddress + 1] - ld h, a - push hl - inc hl - ld a, l - ld [hBGMapAddress], a - ld a, h - ld [hBGMapAddress + 1], a - hlcoord 19, 0 - ld [hl], $66 - hlcoord 19, 1 - ld a, $67 - ld b, 15 - call Bank77_FillColumn - ld [hl], $68 - hlcoord 19, 17 - ld [hl], $3c - xor a - ld b, SCREEN_HEIGHT - hlcoord 19, 0, AttrMap - call Bank77_FillColumn - call WaitBGMap2 - pop hl - ld a, l - ld [hBGMapAddress], a - ld a, h - ld [hBGMapAddress + 1], a - ret - -Bank77_FillColumn: ; 1de27f - push de - ld de, SCREEN_WIDTH -.loop - ld [hl], a - add hl, de - dec b - jr nz, .loop - pop de - ret - -_DudeAutoInput_A:: ; 1de28a - ld hl, DudeAutoInput_A - jr _DudeAutoInput - -_DudeAutoInput_RightA: ; 1de28f - ld hl, DudeAutoInput_RightA - jr _DudeAutoInput - -_DudeAutoInput_DownA: ; 1de294 - ld hl, DudeAutoInput_DownA - jr _DudeAutoInput - -_DudeAutoInput: ; 1de299 - ld a, BANK(DudeAutoInputs) - call StartAutoInput - ret - -DudeAutoInputs: - -DudeAutoInput_A: ; 1de29f - db NO_INPUT, $50 - db A_BUTTON, $00 - db NO_INPUT, $ff ; end - -DudeAutoInput_RightA: ; 1de2a5 - db NO_INPUT, $08 - db D_RIGHT, $00 - db NO_INPUT, $08 - db A_BUTTON, $00 - db NO_INPUT, $ff ; end - -DudeAutoInput_DownA: ; 1de2af - db NO_INPUT, $fe - db NO_INPUT, $fe - db NO_INPUT, $fe - db NO_INPUT, $fe - db D_DOWN, $00 - db NO_INPUT, $fe - db NO_INPUT, $fe - db NO_INPUT, $fe - db NO_INPUT, $fe - db A_BUTTON, $00 - db NO_INPUT, $ff ; end - -TownMap_ConvertLineBreakCharacters: ; 1de2c5 - ld hl, StringBuffer1 -.loop - ld a, [hl] - cp "@" - jr z, .end - cp "%" - jr z, .line_break - cp "¯" - jr z, .line_break - inc hl - jr .loop - -.line_break - ld [hl], "" - -.end - ld de, StringBuffer1 - hlcoord 9, 0 - call PlaceString - ret - -PokegearGFX: ; 1de2e4 -INCBIN "gfx/pokegear/pokegear.2bpp.lz" - -IsMailEuropean: ; 1de5c8 -; return 1 if French -; return 2 if German -; return 3 if Italian -; return 4 if Spanish -; return 0 if none of the above - ld c, $0 - ld hl, sPartyMon1MailAuthorNationality - sPartyMon1Mail - add hl, de - ld a, [hli] - cp "E" - ret nz - ld a, [hli] - inc c - cp "F" - ret z - inc c - cp "G" - ret z - inc c - cp "I" - ret z - inc c - cp "S" - ret z - ld c, $0 - ret - -; The regular font. -StandardEnglishFont: ; 1de5e6 -INCBIN "gfx/font/english.1bpp" - -; An extended font. -FrenchGermanFont: ; 1de9e6 -INCBIN "gfx/font/french_german.1bpp" - -; An even more extended font. -SpanishItalianFont: ; 1dede6 -INCBIN "gfx/font/spanish_italian.1bpp" - -HandleFrenchGermanMail: ; 1df1e6 -; called if mail is french or german -; fix 's 't 'v - ld b, sPartyMon1MailAuthor - sPartyMon1Mail - ld h, d - ld l, e -.loop - ld a, [hl] - cp $dc ; 's in french/german font - jr nz, .check_intermediate_chars - ld a, "'s" - jr .replace - -.check_intermediate_chars - sub "'s" - jr c, .dont_replace - cp "'v" - "'s" + 1 - jr nc, .dont_replace - add $cd - -.replace - ld [hl], a - -.dont_replace - inc hl - dec b - jr nz, .loop - ret - -LireLeCourrierAnglais: -DeutenEnglischenPost: ; 1df203 -; Cette fonction convertit certains des caractères anglais pour -; leur équivalent dans le jeu de caractères français. -; Diese Funktion wandelt bestimmte englische Zeichen, um ihre -; Entsprechung in der Deutschen-Zeichensatz. - ld b, sPartyMon1MailAuthor - sPartyMon1Mail - ld h, d - ld l, e -.loop - ld a, [hl] - cp "'s" - jr nz, .check_intermediate_chars - ld a, $dc - jr .replace - -.check_intermediate_chars - sub $cd - jr c, .dont_replace - cp "'v" - "'s" + 1 - jr nc, .dont_replace - add "'s" - -.replace - ld [hl], a - -.dont_replace - inc hl - dec b - jr nz, .loop - ret - -HandleSpanishItalianMail: ; 1df220 -LeerCorreosIngleses: -LeggiPostaInglese: -; This function converts certain characters between -; the English and Spanish/Italian character sets. -; Esta función convierte ciertos caracteres entre -; el juego de caracteres Inglés y Español. -; Questa funzione converte alcuni caratteri tra -; l'inglese e il set di caratteri italiani. - ld b, sPartyMon1MailAuthor - sPartyMon1Mail - ld h, d - ld l, e -.loop - ld a, [hl] - and $f0 - cp $d0 - jr nz, .dont_replace - ld a, [hl] - add $8 - and $f - or $d0 - ld [hl], a - -.dont_replace - inc hl - dec b - jr nz, .loop - ret +INCLUDE "engine/pokedex_3.asm" +INCLUDE "event/catch_tutorial_input.asm" +INCLUDE "engine/pokegear_2.asm" +INCLUDE "engine/european_mail.asm" SECTION "Battle Tower Text", ROMX @@ -5658,50 +1054,9 @@ SECTION "Battle Tower Trainer Data", ROMX INCLUDE "data/battle_tower_2.asm" -SECTION "bank7D", ROMX +SECTION "Mobile News Data", ROMX - db $cc, $6b, $1e ; XXX - -Function1f4003: ; 1f4003 -; XXX - ld a, $6 - call GetSRAMBank - ld hl, .unknown_data - ld de, $a000 - ld bc, $1000 - call CopyBytes - call CloseSRAM - ret - -.unknown_data -INCBIN "unknown/1f4018.bin" - -Function1f4dbe: ; 1f4dbe -; XXX - ld a, $6 - call GetSRAMBank - ld hl, .unknown_data - ld de, $a000 - ld bc, $1000 - call CopyBytes - call CloseSRAM - ret - -.unknown_data -INCBIN "unknown/1f4dd3.bin" - -Function1f5d9f: ; 1f5d9f - ld a, $6 - call GetSRAMBank - ld hl, .unknown_data - ld de, $a000 - ld bc, $1000 - call CopyBytes - call CloseSRAM - ret - -.unknown_data -INCBIN "unknown/1f5db4.bin" +INCLUDE "mobile/news/news.asm" SECTION "bank7E", ROMX @@ -5713,10 +1068,10 @@ INCLUDE "engine/odd_eggs.asm" SECTION "bank7F", ROMX -SECTION "stadium2", ROMX +SECTION "Mobile Stadium 2", ROMX IF DEF(CRYSTAL11) -INCBIN "misc/stadium2_2.bin" +INCBIN "mobile/stadium/stadium2_2.bin" ELSE -INCBIN "misc/stadium2_1.bin" +INCBIN "mobile/stadium/stadium2_1.bin" ENDC diff --git a/maps.asm b/maps.asm index 80ded93fc..35ca4a835 100644 --- a/maps.asm +++ b/maps.asm @@ -89,7 +89,7 @@ INCLUDE "maps/VioletGym.asm" INCLUDE "maps/EarlsPokemonAcademy.asm" INCLUDE "maps/VioletNicknameSpeechHouse.asm" INCLUDE "maps/VioletPokecenter1F.asm" -INCLUDE "maps/VioletOnixTradeHouse.asm" +INCLUDE "maps/VioletKylesHouse.asm" INCLUDE "maps/Route32RuinsOfAlphGate.asm" INCLUDE "maps/Route32Pokecenter1F.asm" INCLUDE "maps/Route35GoldenrodGate.asm" diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 9238d5dbd..c6b188b8d 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -60,7 +60,7 @@ ReceptionistScript_0x9e3e2: opentext writetext Text_BattleTowerWelcomesYou buttonsound - writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [s1_be4f] + writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags] special BattleTowerAction if_not_equal $0, Script_Menu_ChallengeExplanationCancel jump Script_BattleTowerIntroductionYesNo @@ -85,7 +85,7 @@ Script_ChooseChallenge: ; 0x9e40f special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel dotrigger $1 - writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [s1_be4f] + writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags] special BattleTowerAction special BattleTowerRoomMenu if_equal $a, Script_Menu_ChallengeExplanationCancel diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 1126e1d2d..7217e1050 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -9,24 +9,26 @@ BlackthornDragonSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -GrannyScript_0x195949: - jumptextfaceplayer UnknownText_0x19595c +BlackthornDragonSpeechHouseGrannyScript: + jumptextfaceplayer BlackthornDragonSpeechHouseGrannyText -Dratini: +BlackthornDragonSpeechHouseDratiniScript: opentext - writetext DratiniText + writetext BlackthornDragonSpeechHouseDratiniText cry DRATINI waitbutton closetext end ; unused +BlackthornDragonSpeechHousePictureBookshelf: jumpstd picturebookshelf ; unused +BlackthornDragonSpeechHouseMagazineBookshelf: jumpstd magazinebookshelf -UnknownText_0x19595c: +BlackthornDragonSpeechHouseGrannyText: text "A clan of trainers" line "who can freely" @@ -41,7 +43,7 @@ UnknownText_0x19595c: line "this town." done -DratiniText: +BlackthornDragonSpeechHouseDratiniText: text "DRATINI: Draa!" done @@ -62,5 +64,5 @@ BlackthornDragonSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x195949, -1 - person_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Dratini, -1 + person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1 + person_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index baae2fe8e..651d7e7ec 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -93,9 +93,9 @@ BlackthornGymClairScript: end TrainerCooltrainermPaul: - trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, CooltrainermPaulScript + trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, .Script -CooltrainermPaulScript: +.Script: end_if_just_battled opentext writetext CooltrainermPaulAfterBattleText @@ -104,9 +104,9 @@ CooltrainermPaulScript: end TrainerCooltrainermMike: - trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, CooltrainermMikeScript + trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, .Script -CooltrainermMikeScript: +.Script: end_if_just_battled opentext writetext CooltrainermMikeAfterBattleText @@ -115,9 +115,9 @@ CooltrainermMikeScript: end TrainerCooltrainerfLola: - trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, CooltrainerfLolaScript + trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, .Script -CooltrainerfLolaScript: +.Script: end_if_just_battled opentext writetext CooltrainerfLolaAfterBattleText diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 92b623b2a..3dd4a4d45 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -61,9 +61,9 @@ BlackthornGymBoulder: jumpstd strengthboulder TrainerCooltrainermCody: - trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, CooltrainermCodyScript + trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script -CooltrainermCodyScript: +.Script: end_if_just_battled opentext writetext CooltrainermCodyAfterBattleText @@ -72,9 +72,9 @@ CooltrainermCodyScript: end TrainerCooltrainerfFran: - trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, CooltrainerfFranScript + trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, .Script -CooltrainerfFranScript: +.Script: end_if_just_battled opentext writetext CooltrainerfFranAfterBattleText diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 972ae6f64..be7987a76 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -10,19 +10,19 @@ BlackthornMart_MapScriptHeader: .MapCallbacks: db 0 -ClerkScript_0x195a5d: +BlackthornMartClerkScript: opentext pokemart MARTTYPE_STANDARD, MART_BLACKTHORN closetext end -CooltrainerMScript_0x195a64: - jumptextfaceplayer UnknownText_0x195a6a +BlackthornMartCooltrainerMScript: + jumptextfaceplayer BlackthornMartCooltrainerMText -BlackBeltScript_0x195a67: - jumptextfaceplayer UnknownText_0x195ae9 +BlackthornMartBlackBeltScript: + jumptextfaceplayer BlackthornMartBlackBeltText -UnknownText_0x195a6a: +BlackthornMartCooltrainerMText: text "You can't buy MAX" line "REVIVE, but it" @@ -36,7 +36,7 @@ UnknownText_0x195a6a: line "needed for moves." done -UnknownText_0x195ae9: +BlackthornMartBlackBeltText: text "MAX REPEL keeps" line "weak #MON away" cont "from you." @@ -63,6 +63,6 @@ BlackthornMart_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x195a5d, -1 - person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x195a64, -1 - person_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x195a67, -1 + person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1 + person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1 + person_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1 diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index 6da357319..b235d6143 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -11,19 +11,19 @@ BlackthornPokecenter1F_MapScriptHeader: .MapCallbacks: db 0 -NurseScript_0x195b79: +BlackthornPokecenter1FNurseScript: jumpstd pokecenternurse -GentlemanScript_0x195b7c: - jumptextfaceplayer UnknownText_0x195b85 +BlackthornPokecenter1FGentlemanScript: + jumptextfaceplayer BlackthornPokecenter1FGentlemanText -TwinScript_0x195b7f: - jumptextfaceplayer UnknownText_0x195bfd +BlackthornPokecenter1FTwinScript: + jumptextfaceplayer BlackthornPokecenter1FTwinText -CooltrainerMScript_0x195b82: +BlackthornPokecenter1FCooltrainerMScript: jumpstd happinesschecknpc -UnknownText_0x195b85: +BlackthornPokecenter1FGentlemanText: text "Deep inside far-" line "off INDIGO PLATEAU" @@ -37,7 +37,7 @@ UnknownText_0x195b85: line "the country." done -UnknownText_0x195bfd: +BlackthornPokecenter1FTwinText: text "There was this" line "move I just had" @@ -67,7 +67,7 @@ BlackthornPokecenter1F_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x195b79, -1 - person_event SPRITE_GENTLEMAN, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x195b7c, -1 - person_event SPRITE_TWIN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x195b7f, -1 - person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x195b82, -1 + person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1 + person_event SPRITE_GENTLEMAN, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1 + person_event SPRITE_TWIN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1 + person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 72cd935fc..58bc77983 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -8,29 +8,29 @@ BluesHouse_MapScriptHeader: .MapCallbacks: db 0 -DaisyScript_0x19b0d0: +DaisyScript: faceplayer opentext checkcode VAR_HOUR - if_equal $f, UnknownScript_0x19b0de - writetext UnknownText_0x19b130 + if_equal 15, .ThreePM + writetext DaisyHelloText waitbutton closetext end -UnknownScript_0x19b0de: +.ThreePM: checkflag ENGINE_TEA_IN_BLUES_HOUSE - iftrue UnknownScript_0x19b11e - writetext UnknownText_0x19b1b6 + iftrue .AlreadyGroomedMon + writetext DaisyOfferGroomingText yesorno - iffalse UnknownScript_0x19b124 - writetext UnknownText_0x19b244 + iffalse .Refused + writetext DaisyWhichMonText waitbutton special Special_DaisyMassage - if_equal 0, UnknownScript_0x19b124 - if_equal 1, UnknownScript_0x19b12a + if_equal 0, .Refused + if_equal 1, .CantGroomEgg setflag ENGINE_TEA_IN_BLUES_HOUSE - writetext UnknownText_0x19b266 + writetext DaisyAlrightText waitbutton closetext special FadeOutPalettes @@ -39,33 +39,33 @@ UnknownScript_0x19b0de: special FadeInPalettes special RestartMapMusic opentext - writetext UnknownText_0x19b296 + writetext GroomedMonLooksContentText special PlayCurMonCry buttonsound - writetext UnknownText_0x19b2aa + writetext DaisyAllDoneText waitbutton closetext end -UnknownScript_0x19b11e: - writetext UnknownText_0x19b2fa +.AlreadyGroomedMon: + writetext DaisyAlreadyGroomedText waitbutton closetext end -UnknownScript_0x19b124: - writetext UnknownText_0x19b334 +.Refused: + writetext DaisyRefusedText waitbutton closetext end -UnknownScript_0x19b12a: - writetext UnknownText_0x19b377 +.CantGroomEgg: + writetext DaisyCantGroomEggText waitbutton closetext end -UnknownText_0x19b130: +DaisyHelloText: text "DAISY: Hi! My kid" line "brother is the GYM" @@ -79,7 +79,7 @@ UnknownText_0x19b130: line "for the trainers." done -UnknownText_0x19b1b6: +DaisyOfferGroomingText: text "DAISY: Hi! Good" line "timing. I'm about" cont "to have some tea." @@ -94,24 +94,24 @@ UnknownText_0x19b1b6: line "to groom one?" done -UnknownText_0x19b244: +DaisyWhichMonText: text "DAISY: Which one" line "should I groom?" done -UnknownText_0x19b266: +DaisyAlrightText: text "DAISY: OK, I'll" line "get it looking" cont "nice in no time." done -UnknownText_0x19b296: +GroomedMonLooksContentText: text_from_ram StringBuffer3 text " looks" line "content." done -UnknownText_0x19b2aa: +DaisyAllDoneText: text "DAISY: There you" line "go! All done." @@ -122,7 +122,7 @@ UnknownText_0x19b2aa: line "#MON." done -UnknownText_0x19b2fa: +DaisyAlreadyGroomedText: text "DAISY: I always" line "have tea around" @@ -130,7 +130,7 @@ UnknownText_0x19b2fa: line "join me." done -UnknownText_0x19b334: +DaisyRefusedText: text "DAISY: You don't" line "want to have one" @@ -138,7 +138,7 @@ UnknownText_0x19b334: line "just have tea." done -UnknownText_0x19b377: +DaisyCantGroomEggText: text "DAISY: Oh, sorry." line "I honestly can't" cont "groom an EGG." @@ -161,4 +161,4 @@ BluesHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_DAISY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaisyScript_0x19b0d0, -1 + person_event SPRITE_DAISY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaisyScript, -1 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index a46e01da5..14b1a2d70 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -21,8 +21,8 @@ CeladonCity_MapScriptHeader: setflag ENGINE_FLYPOINT_CELADON return -FisherScript_0x1a9f43: - jumptextfaceplayer UnknownText_0x1a9f7d +CeladonCityFisherScript: + jumptextfaceplayer CeladonCityFisherText CeladonCityPoliwrath: opentext @@ -32,26 +32,26 @@ CeladonCityPoliwrath: closetext end -TeacherScript_0x1a9f50: - jumptextfaceplayer UnknownText_0x1a9fde +CeladonCityTeacher1Script: + jumptextfaceplayer CeladonCityTeacher1Text -GrampsScript_0x1a9f53: - jumptextfaceplayer UnknownText_0x1aa043 +CeladonCityGramps1Script: + jumptextfaceplayer CeladonCityGramps1Text -GrampsScript_0x1a9f56: - jumptextfaceplayer UnknownText_0x1aa0dc +CeladonCityGramps2Script: + jumptextfaceplayer CeladonCityGramps2Text -YoungsterScript_0x1a9f59: - jumptextfaceplayer UnknownText_0x1aa115 +CeladonCityYoungster1Script: + jumptextfaceplayer CeladonCityYoungster1Text -YoungsterScript_0x1a9f5c: - jumptextfaceplayer UnknownText_0x1aa155 +CeladonCityYoungster2Script: + jumptextfaceplayer CeladonCityYoungster2Text -TeacherScript_0x1a9f5f: - jumptextfaceplayer UnknownText_0x1aa1bd +CeladonCityTeacher2Script: + jumptextfaceplayer CeladonCityTeacher2Text -LassScript_0x1a9f62: - jumptextfaceplayer UnknownText_0x1aa306 +CeladonCityLassScript: + jumptextfaceplayer CeladonCityLassText CeladonCitySign: jumptext CeladonCitySignText @@ -77,7 +77,7 @@ CeladonCityPokecenterSign: CeladonCityHiddenPpUp: dwb EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP -UnknownText_0x1a9f7d: +CeladonCityFisherText: text "This POLIWRATH is" line "my partner." @@ -90,7 +90,7 @@ CeladonCityPoliwrathText: text "POLIWRATH: Croak!" done -UnknownText_0x1a9fde: +CeladonCityTeacher1Text: text "I lost at the slot" line "machines again…" @@ -101,7 +101,7 @@ UnknownText_0x1a9fde: line "them out too." done -UnknownText_0x1aa043: +CeladonCityGramps1Text: text "GRIMER have been" line "appearing lately." @@ -116,7 +116,7 @@ UnknownText_0x1aa043: cont "a serious problem…" done -UnknownText_0x1aa0dc: +CeladonCityGramps2Text: text "Nihihi! This GYM" line "is great! Only" @@ -124,7 +124,7 @@ UnknownText_0x1aa0dc: line "here!" done -UnknownText_0x1aa115: +CeladonCityYoungster1Text: text "Want to know a" line "secret?" @@ -133,7 +133,7 @@ UnknownText_0x1aa115: cont "door." done -UnknownText_0x1aa155: +CeladonCityYoungster2Text: text "They're holding an" line "eating contest at" cont "the restaurant." @@ -143,7 +143,7 @@ UnknownText_0x1aa155: cont "feel bloated…" done -UnknownText_0x1aa1bd: +CeladonCityTeacher2Text: text "CELADON DEPT.STORE" line "has the biggest" @@ -160,8 +160,8 @@ UnknownText_0x1aa1bd: line "a sales clerk." done -; possibly unused -UnknownText_0x1aa25b: +; unused +CeladonCityUnusedPokeComCenterText: text "I love being" line "surrounded by tall" cont "buildings!" @@ -179,7 +179,7 @@ UnknownText_0x1aa25b: line "KANTO…" done -UnknownText_0x1aa306: +CeladonCityLassText: text "Looking at the" line "ground while I was" @@ -266,12 +266,12 @@ CeladonCity_MapEventHeader: .PersonEvents: db 9 - person_event SPRITE_FISHER, 11, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a9f43, -1 + person_event SPRITE_FISHER, 11, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCityFisherScript, -1 person_event SPRITE_POLIWAG, 11, 27, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1 - person_event SPRITE_TEACHER, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a9f50, -1 - person_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9f53, -1 - person_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9f56, -1 - person_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a9f59, -1 - person_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a9f5c, -1 - person_event SPRITE_TEACHER, 14, 6, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a9f5f, -1 - person_event SPRITE_LASS, 22, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LassScript_0x1a9f62, -1 + person_event SPRITE_TEACHER, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1 + person_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CeladonCityGramps1Script, -1 + person_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1 + person_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonCityYoungster1Script, -1 + person_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCityYoungster2Script, -1 + person_event SPRITE_TEACHER, 14, 6, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1 + person_event SPRITE_LASS, 22, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonCityLassScript, -1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 60fc6064f..d8d1a1411 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -10,14 +10,14 @@ CeladonDeptStore1F_MapScriptHeader: .MapCallbacks: db 0 -ReceptionistScript_0x709e0: - jumptextfaceplayer UnknownText_0x709ef +CeladonDeptStore1FReceptionistScript: + jumptextfaceplayer CeladonDeptStore1FReceptionistText -GentlemanScript_0x709e3: - jumptextfaceplayer UnknownText_0x70a35 +CeladonDeptStore1FGentlemanScript: + jumptextfaceplayer CeladonDeptStore1FGentlemanText -TeacherScript_0x709e6: - jumptextfaceplayer UnknownText_0x70aa9 +CeladonDeptStore1FTeacherScript: + jumptextfaceplayer CeladonDeptStore1FTeacherText CeladonDeptStore1FDirectory: jumptext CeladonDeptStore1FDirectoryText @@ -25,7 +25,7 @@ CeladonDeptStore1FDirectory: CeladonDeptStore1FElevatorButton: jumpstd elevatorbutton -UnknownText_0x709ef: +CeladonDeptStore1FReceptionistText: text "Hello! Welcome to" line "CELADON DEPT." cont "STORE!" @@ -34,7 +34,7 @@ UnknownText_0x709ef: line "on the wall." done -UnknownText_0x70a35: +CeladonDeptStore1FGentlemanText: text "This DEPT.STORE is" line "part of the same" @@ -46,7 +46,7 @@ UnknownText_0x70a35: cont "same time." done -UnknownText_0x70aa9: +CeladonDeptStore1FTeacherText: text "This is my first" line "time here." @@ -94,6 +94,6 @@ CeladonDeptStore1F_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x709e0, -1 - person_event SPRITE_GENTLEMAN, 4, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x709e3, -1 - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x709e6, -1 + person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1 + person_event SPRITE_GENTLEMAN, 4, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1 + person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index f77747aea..c056a7143 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -25,11 +25,11 @@ ClerkScript_0x70bb5: closetext end -PokefanMScript_0x70bbd: - jumptextfaceplayer UnknownText_0x70bc9 +CeladonDeptStore2FPokefanMScript: + jumptextfaceplayer CeladonDeptStore2FPokefanMText -YoungsterScript_0x70bc0: - jumptextfaceplayer UnknownText_0x70c3e +CeladonDeptStore2FYoungsterScript: + jumptextfaceplayer CeladonDeptStore2FYoungsterText CeladonDeptStore2FDirectory: jumptext CeladonDeptStore2FDirectoryText @@ -37,7 +37,7 @@ CeladonDeptStore2FDirectory: CeladonDeptStore2FElevatorButton: jumpstd elevatorbutton -UnknownText_0x70bc9: +CeladonDeptStore2FPokefanMText: text "I just recently" line "became a trainer." @@ -49,7 +49,7 @@ UnknownText_0x70bc9: cont "convenient items." done -UnknownText_0x70c3e: +CeladonDeptStore2FYoungsterText: text "My dad's having a" line "hard time learning" @@ -90,5 +90,5 @@ CeladonDeptStore2F_MapEventHeader: db 4 person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1 person_event SPRITE_CLERK, 5, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1 - person_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x70bbd, -1 - person_event SPRITE_YOUNGSTER, 2, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x70bc0, -1 + person_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1 + person_event SPRITE_YOUNGSTER, 2, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index a4ff77955..72f4f26ea 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -19,29 +19,29 @@ ClerkScript_0x70d29: closetext end -YoungsterScript_0x70d31: - jumptextfaceplayer UnknownText_0x70d53 +CeladonDeptStore3FYoungsterScript: + jumptextfaceplayer CeladonDeptStore3FYoungsterText -GameboyKidScript_0x70d34: +CeladonDeptStore3FGameboyKid1Script: faceplayer opentext - writetext UnknownText_0x70d86 + writetext CeladonDeptStore3FGameboyKid1Text waitbutton closetext spriteface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN end -GameboyKidScript_0x70d3f: +CeladonDeptStore3FGameboyKid2Script: faceplayer opentext - writetext UnknownText_0x70dc7 + writetext CeladonDeptStore3FGameboyKid2Text waitbutton closetext spriteface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN end -SuperNerdScript_0x70d4a: - jumptextfaceplayer UnknownText_0x70e61 +CeladonDeptStore3FSuperNerdScript: + jumptextfaceplayer CeladonDeptStore3FSuperNerdText CeladonDeptStore3FElevatorButton: jumpstd elevatorbutton @@ -49,7 +49,7 @@ CeladonDeptStore3FElevatorButton: CeladonDeptStore3FDirectory: jumptext CeladonDeptStore3FDirectoryText -UnknownText_0x70d53: +CeladonDeptStore3FYoungsterText: text "I can't decide" line "which #MON I" @@ -57,7 +57,7 @@ UnknownText_0x70d53: line "on…" done -UnknownText_0x70d86: +CeladonDeptStore3FGameboyKid1Text: text "Uh-oh! I traded my" line "#MON without" @@ -65,7 +65,7 @@ UnknownText_0x70d86: line "GRADE from it." done -UnknownText_0x70dc7: +CeladonDeptStore3FGameboyKid2Text: text "Yeah! I'm finally" line "getting a PORYGON!" @@ -82,7 +82,7 @@ UnknownText_0x70dc7: cont "ferent #MON!" done -UnknownText_0x70e61: +CeladonDeptStore3FSuperNerdText: text "The TM SHOP sells" line "some rare moves." done @@ -115,7 +115,7 @@ CeladonDeptStore3F_MapEventHeader: .PersonEvents: db 5 person_event SPRITE_CLERK, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1 - person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x70d31, -1 - person_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x70d34, -1 - person_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x70d3f, -1 - person_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x70d4a, -1 + person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1 + person_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1 + person_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1 + person_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 7acaa69db..a31c98015 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -17,11 +17,11 @@ ClerkScript_0x70f0d: closetext end -SuperNerdScript_0x70f15: - jumptextfaceplayer UnknownText_0x70f21 +CeladonDeptStore4FSuperNerdScript: + jumptextfaceplayer CeladonDeptStore4FSuperNerdText -YoungsterScript_0x70f18: - jumptextfaceplayer UnknownText_0x70f55 +CeladonDeptStore4FYoungsterScript: + jumptextfaceplayer CeladonDeptStore4FYoungsterText CeladonDeptStore4FDirectory: jumptext CeladonDeptStore4FDirectoryText @@ -29,13 +29,13 @@ CeladonDeptStore4FDirectory: CeladonDeptStore4FElevatorButton: jumpstd elevatorbutton -UnknownText_0x70f21: +CeladonDeptStore4FSuperNerdText: text "I'm here to buy" line "SURF MAIL to send" cont "to my girlfriend." done -UnknownText_0x70f55: +CeladonDeptStore4FYoungsterText: text "This is the only" line "place where you" @@ -71,5 +71,5 @@ CeladonDeptStore4F_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1 - person_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x70f15, -1 - person_event SPRITE_YOUNGSTER, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x70f18, -1 + person_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1 + person_event SPRITE_YOUNGSTER, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 6ee0fce13..d111c0c2c 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -26,14 +26,14 @@ ClerkScript_0x7100c: closetext end -GentlemanScript_0x71014: - jumptextfaceplayer UnknownText_0x71023 +CeladonDeptStore5FGentlemanScript: + jumptextfaceplayer CeladonDeptStore5FGentlemanText -SailorScript_0x71017: - jumptextfaceplayer UnknownText_0x71072 +CeladonDeptStore5FSailorScript: + jumptextfaceplayer CeladonDeptStore5FSailorText -TeacherScript_0x7101a: - jumptextfaceplayer UnknownText_0x710b6 +CeladonDeptStore5FTeacherScript: + jumptextfaceplayer CeladonDeptStore5FTeacherText CeladonDeptStore5FDirectory: jumptext CeladonDeptStore5FDirectoryText @@ -41,7 +41,7 @@ CeladonDeptStore5FDirectory: CeladonDeptStore5FElevatorButton: jumpstd elevatorbutton -UnknownText_0x71023: +CeladonDeptStore5FGentlemanText: text "I want to buy some" line "items that raise" @@ -50,7 +50,7 @@ UnknownText_0x71023: cont "enough money…" done -UnknownText_0x71072: +CeladonDeptStore5FSailorText: text "I want PP UP, so I" line "can raise the PP" @@ -58,7 +58,7 @@ UnknownText_0x71072: line "can't buy it…" done -UnknownText_0x710b6: +CeladonDeptStore5FTeacherText: text "Using items on" line "them makes #-" cont "MON happy." @@ -93,6 +93,6 @@ CeladonDeptStore5F_MapEventHeader: db 5 person_event SPRITE_CLERK, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x71004, -1 person_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1 - person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x71014, -1 - person_event SPRITE_SAILOR, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x71017, -1 - person_event SPRITE_TEACHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7101a, -1 + person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1 + person_event SPRITE_SAILOR, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1 + person_event SPRITE_TEACHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index a25b5e591..88f6b756e 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -14,13 +14,13 @@ CeladonDeptStore6F_MapScriptHeader: changeblock $c, $0, $3 return -SuperNerdScript_0x7117a: - jumptextfaceplayer UnknownText_0x712c7 +CeladonDeptStore6FSuperNerdScript: + jumptextfaceplayer CeladonDeptStore6FSuperNerdText -YoungsterScript_0x7117d: - jumptextfaceplayer UnknownText_0x71310 +CeladonDeptStore6FYoungsterScript: + jumptextfaceplayer CeladonDeptStore6FYoungsterText -CeladonVendingMachine: +CeladonDeptStore6FVendingMachine: opentext writetext CeladonVendingText .Start: @@ -98,7 +98,8 @@ CeladonVendingMachine: CeladonDeptStore6FDirectory: jumptext CeladonDeptStore6FDirectoryText -UnknownScript_0x7124d: +; unused +CeladonDeptStore6FElevatorButton: jumpstd elevatorbutton CeladonVendingText: @@ -125,7 +126,7 @@ CeladonVendingNoSpaceText: line "room for stuff…" done -UnknownText_0x712c7: +CeladonDeptStore6FSuperNerdText: text "A vending machine" line "with a prize rou-" cont "lette…" @@ -134,7 +135,7 @@ UnknownText_0x712c7: line "those anymore." done -UnknownText_0x71310: +CeladonDeptStore6FYoungsterText: text "Aww! There's no" line "games here!" @@ -162,12 +163,12 @@ CeladonDeptStore6F_MapEventHeader: db 6 signpost 0, 14, SIGNPOST_READ, CeladonDeptStore6FDirectory signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton - signpost 1, 8, SIGNPOST_UP, CeladonVendingMachine - signpost 1, 9, SIGNPOST_UP, CeladonVendingMachine - signpost 1, 10, SIGNPOST_UP, CeladonVendingMachine - signpost 1, 11, SIGNPOST_UP, CeladonVendingMachine + signpost 1, 8, SIGNPOST_UP, CeladonDeptStore6FVendingMachine + signpost 1, 9, SIGNPOST_UP, CeladonDeptStore6FVendingMachine + signpost 1, 10, SIGNPOST_UP, CeladonDeptStore6FVendingMachine + signpost 1, 11, SIGNPOST_UP, CeladonDeptStore6FVendingMachine .PersonEvents: db 2 - person_event SPRITE_SUPER_NERD, 2, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7117a, -1 - person_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x7117d, -1 + person_event SPRITE_SUPER_NERD, 2, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1 + person_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1 diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index 2f3be1a3d..5af977699 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -5,20 +5,19 @@ CeladonDeptStoreElevator_MapScriptHeader: .MapCallbacks: db 0 -MapCeladonDeptStoreElevatorSignpost0Script: +CeladonDeptStoreElevatorScript: opentext - elevator Elevator_0x713be + elevator CeladonDeptStoreElevatorData closetext - iffalse UnknownScript_0x713bd + iffalse .Done pause 5 playsound SFX_ELEVATOR earthquake 60 waitsfx -UnknownScript_0x713bd: +.Done: end - -Elevator_0x713be: +CeladonDeptStoreElevatorData: db 6 ; floors elevfloor FLOOR_1F, 4, CELADON_DEPT_STORE_1F elevfloor FLOOR_2F, 3, CELADON_DEPT_STORE_2F @@ -28,22 +27,21 @@ Elevator_0x713be: elevfloor FLOOR_6F, 2, CELADON_DEPT_STORE_6F db $ff ; end - CeladonDeptStoreElevator_MapEventHeader: ; filler db 0, 0 .Warps: db 2 - warp_def $3, $1, 255, CELADON_DEPT_STORE_1F - warp_def $3, $2, 255, CELADON_DEPT_STORE_1F + warp_def $3, $1, -1, CELADON_DEPT_STORE_1F + warp_def $3, $2, -1, CELADON_DEPT_STORE_1F .XYTriggers: db 0 .Signposts: db 1 - signpost 0, 3, SIGNPOST_READ, MapCeladonDeptStoreElevatorSignpost0Script + signpost 0, 3, SIGNPOST_READ, CeladonDeptStoreElevatorScript .PersonEvents: db 0 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index bd9b9b713..78e7c9e56 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -16,77 +16,77 @@ CeladonGameCorner_MapScriptHeader: .MapCallbacks: db 0 -ClerkScript_0x7211d: +CeladonGameCornerClerkScript: jumpstd gamecornercoinvendor -ReceptionistScript_0x72120: - jumptextfaceplayer UnknownText_0x721d0 +CeladonGameCornerReceptionistScript: + jumptextfaceplayer CeladonGameCornerReceptionistText -PokefanMScript_0x72123: +CeladonGameCornerPokefanMScript: faceplayer opentext - writetext UnknownText_0x72215 + writetext CeladonGameCornerPokefanMText waitbutton closetext spriteface CELADONGAMECORNER_POKEFAN_M, LEFT end -TeacherScript_0x7212e: +CeladonGameCornerTeacherScript: faceplayer opentext - writetext UnknownText_0x72242 + writetext CeladonGameCornerTeacherText waitbutton closetext spriteface CELADONGAMECORNER_TEACHER, RIGHT end -FishingGuruScript_0x72139: +CeladonGameCornerFishingGuruScript: faceplayer opentext - writetext UnknownText_0x72295 + writetext CeladonGameCornerFishingGuruText waitbutton closetext spriteface CELADONGAMECORNER_FISHING_GURU, RIGHT end -FisherScript_0x72144: +CeladonGameCornerFisherScript: faceplayer opentext checkevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON - iftrue .UnknownScript_0x72169 - writetext UnknownText_0x722dc + iftrue .GotCoins + writetext CeladonGameCornerFisherText1 buttonsound checkitem COIN_CASE - iffalse UnknownScript_0x7217b + iffalse .NoCoinCase checkcoins 9998 - if_equal $0, UnknownScript_0x72184 + if_equal $0, .FullCoinCase stringtotext .coinname, $1 - scall .UnknownScript_0x72172 + scall .GiveCoins givecoins 18 setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON -.UnknownScript_0x72169: - writetext UnknownText_0x72345 +.GotCoins: + writetext CeladonGameCornerFisherText2 waitbutton closetext spriteface LAST_TALKED, LEFT end -.UnknownScript_0x72172: +.GiveCoins: jumpstd receiveitem end .coinname db "COIN@" -UnknownScript_0x7217b: - writetext UnknownText_0x7238a +.NoCoinCase: + writetext CeladonGameCornerFisherNoCoinCaseText waitbutton closetext spriteface LAST_TALKED, LEFT end -UnknownScript_0x72184: - writetext UnknownText_0x723d9 +.FullCoinCase: + writetext CeladonGameCornerFisherFullCoinCaseText waitbutton closetext spriteface LAST_TALKED, LEFT @@ -95,45 +95,45 @@ UnknownScript_0x72184: CeladonGymGuyScript: jumptextfaceplayer CeladonGymGuyText -GrampsScript_0x72190: +CeladonGameCornerGrampsScript: faceplayer opentext - writetext UnknownText_0x724ad + writetext CeladonGameCornerGrampsText waitbutton closetext spriteface CELADONGAMECORNER_GRAMPS, LEFT end -MapCeladonGameCornerSignpost36Script: - jumptext UnknownText_0x724f3 +CeladonGameCornerPoster1Script: + jumptext CeladonGameCornerPoster1Text -MapCeladonGameCornerSignpost37Script: - jumptext UnknownText_0x72521 +CeladonGameCornerPoster2Script: + jumptext CeladonGameCornerPoster2Text -MapCeladonGameCornerSignpost35Script: +CeladonGameCornerLuckySlotMachineScript: random $6 - if_equal $0, MapCeladonGameCornerSignpost16Script + if_equal $0, CeladonGameCornerSlotMachineScript refreshscreen $0 writebyte $0 special Special_SlotMachine closetext end -MapCeladonGameCornerSignpost16Script: +CeladonGameCornerSlotMachineScript: refreshscreen $0 writebyte $1 special Special_SlotMachine closetext end -MapCeladonGameCornerSignpost11Script: +CeladonGameCornerCardFlipScript: refreshscreen $0 special Special_CardFlip closetext end -MapCeladonGameCornerSignpost32Script: - jumptext UnknownText_0x7254f +CeladonGameCornerLighterScript: + jumptext CeladonGameCornerLighterText MapCeladonGameCornerSignpost9Script: opentext @@ -149,7 +149,7 @@ MovementData_0x721cd: turn_head LEFT step_end -UnknownText_0x721d0: +CeladonGameCornerReceptionistText: text "Welcome!" para "You may exchange" @@ -159,13 +159,13 @@ UnknownText_0x721d0: line "next door." done -UnknownText_0x72215: +CeladonGameCornerPokefanMText: text "The slot machines" line "are all state of" cont "the art." done -UnknownText_0x72242: +CeladonGameCornerTeacherText: text "It's this machine" line "I want." @@ -176,7 +176,7 @@ UnknownText_0x72242: line "today." done -UnknownText_0x72295: +CeladonGameCornerFishingGuruText: text "I think this slot" line "machine will pay" cont "out…" @@ -185,7 +185,7 @@ UnknownText_0x72295: line "among machines." done -UnknownText_0x722dc: +CeladonGameCornerFisherText1: text "Gahahaha!" para "The coins just" @@ -198,7 +198,7 @@ UnknownText_0x722dc: line "with you!" done -UnknownText_0x72345: +CeladonGameCornerFisherText2: text "Gahahaha!" para "It makes me feel" @@ -208,7 +208,7 @@ UnknownText_0x72345: line "people!" done -UnknownText_0x7238a: +CeladonGameCornerFisherNoCoinCaseText: text "Hey, you don't" line "have a COIN CASE." @@ -217,7 +217,7 @@ UnknownText_0x7238a: cont "coins, kid?" done -UnknownText_0x723d9: +CeladonGameCornerFisherFullCoinCaseText: text "Hey, your COIN" line "CASE is full, kid." @@ -241,7 +241,7 @@ CeladonGymGuyText: line "enough coins yet…" done -UnknownText_0x724ad: +CeladonGameCornerGrampsText: text "Hmmm… The odds are" line "surely better for" @@ -249,7 +249,7 @@ UnknownText_0x724ad: line "but… What to do?" done -UnknownText_0x724f3: +CeladonGameCornerPoster1Text: text "Hey!" para "Underneath this" @@ -258,7 +258,7 @@ UnknownText_0x724f3: para "There's nothing!" done -UnknownText_0x72521: +CeladonGameCornerPoster2Text: text "Hey!" para "Underneath this" @@ -267,7 +267,7 @@ UnknownText_0x72521: para "There's nothing!" done -UnknownText_0x7254f: +CeladonGameCornerLighterText: text "There's a lighter" line "here." done @@ -295,53 +295,53 @@ CeladonGameCorner_MapEventHeader: .Signposts: db 38 - signpost 6, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 7, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 8, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 9, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 10, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 11, 1, SIGNPOST_LEFT, MapCeladonGameCornerSignpost11Script - signpost 6, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 7, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 8, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 6, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript + signpost 7, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript + signpost 8, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript + signpost 9, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript + signpost 10, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript + signpost 11, 1, SIGNPOST_LEFT, CeladonGameCornerCardFlipScript + signpost 6, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript + signpost 7, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript + signpost 8, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript signpost 9, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost9Script - signpost 10, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 11, 6, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost11Script - signpost 6, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 7, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 8, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 9, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 10, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost16Script - signpost 11, 7, SIGNPOST_LEFT, MapCeladonGameCornerSignpost35Script - signpost 6, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 7, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 8, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 9, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 10, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 11, 12, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost35Script - signpost 6, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 7, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 8, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 9, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 10, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 11, 13, SIGNPOST_LEFT, MapCeladonGameCornerSignpost35Script - signpost 6, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 7, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 8, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost32Script - signpost 9, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 10, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 11, 18, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost35Script - signpost 0, 15, SIGNPOST_READ, MapCeladonGameCornerSignpost36Script - signpost 0, 9, SIGNPOST_READ, MapCeladonGameCornerSignpost37Script + signpost 10, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript + signpost 11, 6, SIGNPOST_RIGHT, CeladonGameCornerCardFlipScript + signpost 6, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 7, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 8, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 9, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 10, 7, SIGNPOST_READ, CeladonGameCornerSlotMachineScript + signpost 11, 7, SIGNPOST_LEFT, CeladonGameCornerLuckySlotMachineScript + signpost 6, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 7, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 8, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 9, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 10, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 11, 12, SIGNPOST_RIGHT, CeladonGameCornerLuckySlotMachineScript + signpost 6, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 7, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 8, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 9, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 10, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 11, 13, SIGNPOST_LEFT, CeladonGameCornerLuckySlotMachineScript + signpost 6, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 7, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 8, 18, SIGNPOST_READ, CeladonGameCornerLighterScript + signpost 9, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 10, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 11, 18, SIGNPOST_RIGHT, CeladonGameCornerLuckySlotMachineScript + signpost 0, 15, SIGNPOST_READ, CeladonGameCornerPoster1Script + signpost 0, 9, SIGNPOST_READ, CeladonGameCornerPoster2Script .PersonEvents: db 9 - person_event SPRITE_CLERK, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7211d, -1 - person_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x72120, -1 - person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x72123, -1 - person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7212e, -1 - person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x72139, -1 - person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 - person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 + person_event SPRITE_CLERK, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1 + person_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1 + person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1 + person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1 + person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1 + person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 + person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 person_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 - person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x72190, -1 + person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 67b8a86fc..88fe6d8e0 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -50,9 +50,9 @@ UnknownScript_0x72aae: end TrainerLassMichelle: - trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, LassMichelleScript + trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script -LassMichelleScript: +.Script: end_if_just_battled opentext writetext LassMichelleAfterBattleText @@ -61,9 +61,9 @@ LassMichelleScript: end TrainerPicnickerTanya: - trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, PicnickerTanyaScript + trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script -PicnickerTanyaScript: +.Script: end_if_just_battled opentext writetext PicnickerTanyaAfterBattleText @@ -72,9 +72,9 @@ PicnickerTanyaScript: end TrainerBeautyJulia: - trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, BeautyJuliaScript + trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script -BeautyJuliaScript: +.Script: end_if_just_battled opentext writetext BeautyJuliaAfterBattleText @@ -83,9 +83,9 @@ BeautyJuliaScript: end TrainerTwinsJoandzoe1: - trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, TwinsJoandzoe1Script + trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script -TwinsJoandzoe1Script: +.Script: end_if_just_battled opentext writetext TwinsJoandzoe1AfterBattleText @@ -94,9 +94,9 @@ TwinsJoandzoe1Script: end TrainerTwinsJoandzoe2: - trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, TwinsJoandzoe2Script + trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script -TwinsJoandzoe2Script: +.Script: end_if_just_battled opentext writetext TwinsJoandzoe2AfterBattleText diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 95ede4ab7..60e636cae 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -65,11 +65,11 @@ UnknownScript_0x716b6: closetext end -SuperNerdScript_0x716bc: - jumptextfaceplayer UnknownText_0x71895 +CeladonMansion3FSuperNerdScript: + jumptextfaceplayer CeladonMansion3FSuperNerdText -FisherScript_0x716bf: - jumptextfaceplayer UnknownText_0x718ca +CeladonMansion3FFisherScript: + jumptextfaceplayer CeladonMansion3FFisherText MapCeladonMansion3FSignpost0Script: jumptext UnknownText_0x7190b @@ -145,7 +145,7 @@ UnknownText_0x71863: cont "cel printing." done -UnknownText_0x71895: +CeladonMansion3FSuperNerdText: text "Who, me? I'm the" line "PROGRAMMER." @@ -153,7 +153,7 @@ UnknownText_0x71895: line "machines!" done -UnknownText_0x718ca: +CeladonMansion3FFisherText: text "Aren't the TWINS" line "adorable?" @@ -214,5 +214,5 @@ CeladonMansion3F_MapEventHeader: db 4 person_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1 person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1 - person_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x716bc, -1 - person_event SPRITE_FISHER, 4, 0, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x716bf, -1 + person_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1 + person_event SPRITE_FISHER, 4, 0, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 07ac72267..8857e93c9 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -8,13 +8,13 @@ CeladonMansionRoof_MapScriptHeader: .MapCallbacks: db 0 -FisherScript_0x71a39: - jumptextfaceplayer UnknownText_0x71a3f +CeladonMansionRoofFisherScript: + jumptextfaceplayer CeladonMansionRoofFisherText MapCeladonMansionRoofSignpost0Script: jumptext UnknownText_0x71aa1 -UnknownText_0x71a3f: +CeladonMansionRoofFisherText: text "High places--I do" line "love them so!" @@ -52,4 +52,4 @@ CeladonMansionRoof_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_FISHER, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x71a39, -1 + person_event SPRITE_FISHER, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1 diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 03912f623..086de9a86 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -18,11 +18,11 @@ NurseScript_0x71e22: GentlemanScript_0x71e25: jumpstd happinesschecknpc -CooltrainerFScript_0x71e28: - jumptextfaceplayer UnknownText_0x71e70 +CeladonPokecenter1FCooltrainerFScript: + jumptextfaceplayer CeladonPokecenter1FCooltrainerFText -PharmacistScript_0x71e2b: - jumptextfaceplayer UnknownText_0x71ec1 +CeladonPokecenter1FPharmacistScript: + jumptextfaceplayer CeladonPokecenter1FPharmacistText CeladonEusine: faceplayer @@ -72,7 +72,7 @@ CeladonEusine: step DOWN step_end -UnknownText_0x71e70: +CeladonPokecenter1FCooltrainerFText: text "ERIKA is a master" line "of grass #MON." @@ -81,7 +81,7 @@ UnknownText_0x71e70: cont "watch yourself." done -UnknownText_0x71ec1: +CeladonPokecenter1FPharmacistText: text "TEAM ROCKET's" line "hideout is in the" @@ -165,6 +165,6 @@ CeladonPokecenter1F_MapEventHeader: db 5 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x71e22, -1 person_event SPRITE_GENTLEMAN, 5, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1 - person_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x71e2b, -1 - person_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x71e28, -1 + person_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1 + person_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1 person_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 9c781cb43..55b3ff6d7 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -18,24 +18,24 @@ CeruleanCity_MapScriptHeader: setflag ENGINE_FLYPOINT_CERULEAN return -CooltrainerMScript_0x184009: +CeruleanCityCooltrainerMScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x184017 - writetext UnknownText_0x1840bc + iftrue .ReturnedMachinePart + writetext CeruleanCityCooltrainerMText1 waitbutton closetext end -UnknownScript_0x184017: - writetext UnknownText_0x184144 +.ReturnedMachinePart: + writetext CeruleanCityCooltrainerMText2 waitbutton closetext end -SuperNerdScript_0x18401d: - jumptextfaceplayer UnknownText_0x1841a8 +CeruleanCitySuperNerdScript: + jumptextfaceplayer CeruleanCitySuperNerdText CeruleanCitySlowbro: opentext @@ -45,15 +45,15 @@ CeruleanCitySlowbro: closetext end -CooltrainerFScript_0x18402a: +CeruleanCityCooltrainerFScript: faceplayer opentext - writetext UnknownText_0x1841fa + writetext CeruleanCityCooltrainerFText1 waitbutton closetext spriteface CERULEANCITY_COOLTRAINER_F, LEFT opentext - writetext UnknownText_0x184229 + writetext CeruleanCityCooltrainerFText2 waitbutton closetext opentext @@ -62,41 +62,41 @@ CooltrainerFScript_0x18402a: waitbutton closetext opentext - writetext UnknownText_0x18424b + writetext CeruleanCityCooltrainerFText3 waitbutton closetext end -FisherScript_0x18404a: +CeruleanCityFisherScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x184058 + iftrue .ReturnedMachinePart checkevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM - iftrue UnknownScript_0x18405e -UnknownScript_0x184058: - writetext UnknownText_0x18424e + iftrue .MetCeruleanRocket +.ReturnedMachinePart: + writetext CeruleanCityFisherText waitbutton closetext end -UnknownScript_0x18405e: - writetext UnknownText_0x184275 +.MetCeruleanRocket: + writetext CeruleanCityFisherRocketTipText waitbutton closetext end -YoungsterScript_0x184064: +CeruleanCityYoungsterScript: faceplayer opentext - writetext UnknownText_0x1842a9 + writetext CeruleanCityYoungsterText1 waitbutton closetext checkevent EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY - iffalse UnknownScript_0x184072 + iffalse .BerserkGenePingsItemfinder end -UnknownScript_0x184072: +.BerserkGenePingsItemfinder: waitsfx playsound SFX_SECOND_PART_OF_ITEMFINDER waitsfx @@ -117,7 +117,7 @@ UnknownScript_0x184072: showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15 spriteface CERULEANCITY_YOUNGSTER, LEFT opentext - writetext UnknownText_0x1842ee + writetext CeruleanCityYoungsterText2 waitbutton closetext end @@ -149,7 +149,7 @@ CeruleanCityMartSign: CeruleanCityHiddenBerserkGene: dwb EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE -UnknownText_0x1840bc: +CeruleanCityCooltrainerMText1: text "KANTO's POWER" line "PLANT?" @@ -164,7 +164,7 @@ UnknownText_0x1840bc: cont "some sort there." done -UnknownText_0x184144: +CeruleanCityCooltrainerMText2: text "You're collecting" line "every single kind" cont "of #MON?" @@ -174,7 +174,7 @@ UnknownText_0x184144: cont "it sounds fun too." done -UnknownText_0x1841a8: +CeruleanCitySuperNerdText: text "The CAPE in the" line "north is a good" @@ -186,34 +186,34 @@ CeruleanCitySlowbroText: text "SLOWBRO: Yarah?" done -UnknownText_0x1841fa: +CeruleanCityCooltrainerFText1: text "My SLOWBRO and I" line "make an awesome" cont "combination!" done -UnknownText_0x184229: +CeruleanCityCooltrainerFText2: text "SLOWBRO, show me" line "your CONFUSION!" done -UnknownText_0x18424b: +CeruleanCityCooltrainerFText3: text "…" done -UnknownText_0x18424e: +CeruleanCityFisherText: text "I'm a huge fan of" line "CERULEAN GYM's" cont "MISTY." done -UnknownText_0x184275: +CeruleanCityFisherRocketTipText: text "I saw this shady" line "guy go off toward" cont "CERULEAN's CAPE." done -UnknownText_0x1842a9: +CeruleanCityYoungsterText1: text "There used to be a" line "cave here that had" @@ -221,7 +221,7 @@ UnknownText_0x1842a9: line "#MON in it." done -UnknownText_0x1842ee: +CeruleanCityYoungsterText2: text "Ayuh?" para "My ITEMFINDER is" @@ -305,9 +305,9 @@ CeruleanCity_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x184009, -1 - person_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x18401d, -1 + person_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1 + person_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1 person_event SPRITE_SLOWPOKE, 24, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1 - person_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18402a, -1 - person_event SPRITE_FISHER, 26, 30, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x18404a, -1 - person_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x184064, -1 + person_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanCityCooltrainerFScript, -1 + person_event SPRITE_FISHER, 26, 30, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeruleanCityFisherScript, -1 + person_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 4ae52bfa6..e7f9e9a1f 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -86,9 +86,9 @@ MistyScript_0x188432: end TrainerSwimmerfDiana: - trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, SwimmerfDianaScript + trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script -SwimmerfDianaScript: +.Script: end_if_just_battled opentext writetext SwimmerfDianaAfterBattleText @@ -97,9 +97,9 @@ SwimmerfDianaScript: end TrainerSwimmerfBriana: - trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, SwimmerfBrianaScript + trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script -SwimmerfBrianaScript: +.Script: end_if_just_battled opentext writetext SwimmerfBrianaAfterBattleText @@ -108,9 +108,9 @@ SwimmerfBrianaScript: end TrainerSwimmermParker: - trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, SwimmermParkerScript + trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script -SwimmermParkerScript: +.Script: end_if_just_battled opentext writetext SwimmermParkerAfterBattleText diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index c6cdd60ac..2eae4d404 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -8,10 +8,10 @@ CeruleanGymBadgeSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -PokefanMScript_0x188002: - jumptextfaceplayer UnknownText_0x188005 +CeruleanGymBadgeSpeechHousePokefanMScript: + jumptextfaceplayer CeruleanGymBadgeSpeechHousePokefanMText -UnknownText_0x188005: +CeruleanGymBadgeSpeechHousePokefanMText: text "Are you collecting" line "KANTO GYM BADGES?" done @@ -33,4 +33,4 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x188002, -1 + person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1 diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 7933c6386..75990c9c8 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -21,8 +21,8 @@ SuperNerdScript_0x188212: .mobile jumptextfaceplayer UnknownText_0x18828c -GymGuyScript_0x18821e: - jumptextfaceplayer UnknownText_0x1882ff +CeruleanPokecenter1FGymGuyScript: + jumptextfaceplayer CeruleanPokecenter1FGymGuyText UnknownText_0x188221: text "For battles, I'd" @@ -48,7 +48,7 @@ UnknownText_0x18828c: cont "nerve wracking." done -UnknownText_0x1882ff: +CeruleanPokecenter1FGymGuyText: text "The MAGNET TRAIN" line "travels at over" @@ -82,4 +82,4 @@ CeruleanPokecenter1F_MapEventHeader: db 3 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18820f, -1 person_event SPRITE_SUPER_NERD, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1 - person_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x18821e, -1 + person_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 452f35444..219efdca5 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -10,11 +10,11 @@ CeruleanPoliceStation_MapScriptHeader: .MapCallbacks: db 0 -FishingGuruScript_0x18804a: - jumptextfaceplayer UnknownText_0x18805a +CeruleanPoliceStationFishingGuruScript: + jumptextfaceplayer CeruleanPoliceStationFishingGuruText -PokefanFScript_0x18804d: - jumptextfaceplayer UnknownText_0x1880c3 +CeruleanPoliceStationPokefanFScript: + jumptextfaceplayer CeruleanPoliceStationPokefanFText CeruleanDiglett: opentext @@ -24,7 +24,7 @@ CeruleanDiglett: closetext end -UnknownText_0x18805a: +CeruleanPoliceStationFishingGuruText: text "I heard that some" line "shady character is" cont "skulking about." @@ -34,7 +34,7 @@ UnknownText_0x18805a: cont "to be a thief." done -UnknownText_0x1880c3: +CeruleanPoliceStationPokefanFText: text "We were held up by" line "robbers before." done @@ -60,6 +60,6 @@ CeruleanPoliceStation_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x18804a, -1 - person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x18804d, -1 + person_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1 + person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1 person_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CeruleanDiglett, -1 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 13c4b86ca..617f443e5 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -11,11 +11,11 @@ CeruleanTradeSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -GrannyScript_0x188133: - jumptextfaceplayer UnknownText_0x18814d +CeruleanTradeSpeechHouseGrannyScript: + jumptextfaceplayer CeruleanTradeSpeechHouseGrannyText -GrampsScript_0x188136: - jumptextfaceplayer UnknownText_0x18818a +CeruleanTradeSpeechHouseGrampsScript: + jumptextfaceplayer CeruleanTradeSpeechHouseGrampsText RhydonScript_0x188139: opentext @@ -33,14 +33,14 @@ ZubatScript_0x188143: closetext end -UnknownText_0x18814d: +CeruleanTradeSpeechHouseGrannyText: text "My husband lives" line "happily with #-" cont "MON he got through" cont "trades." done -UnknownText_0x18818a: +CeruleanTradeSpeechHouseGrampsText: text "Ah… I'm so happy…" done @@ -70,7 +70,7 @@ CeruleanTradeSpeechHouse_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrannyScript_0x188133, -1 - person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x188136, -1 + person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1 + person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1 person_event SPRITE_RHYDON, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, RhydonScript_0x188139, -1 person_event SPRITE_ZUBAT, 6, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ZubatScript_0x188143, -1 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index fdc765707..9b918fc92 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -9,16 +9,16 @@ CherrygroveGymSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -PokefanMScript_0x196ae1: - jumptextfaceplayer UnknownText_0x196aea +CherrygroveGymSpeechHousePokefanMScript: + jumptextfaceplayer CherrygroveGymSpeechHousePokefanMText -BugCatcherScript_0x196ae4: - jumptextfaceplayer UnknownText_0x196b65 +CherrygroveGymSpeechHouseBugCatcherScript: + jumptextfaceplayer CherrygroveGymSpeechHouseBugCatcherText CherrygroveGymSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x196aea: +CherrygroveGymSpeechHousePokefanMText: text "You're trying to" line "see how good you" @@ -32,7 +32,7 @@ UnknownText_0x196aea: line "collect BADGES." done -UnknownText_0x196b65: +CherrygroveGymSpeechHouseBugCatcherText: text "When I get older," line "I'm going to be a" cont "GYM LEADER!" @@ -63,5 +63,5 @@ CherrygroveGymSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x196ae1, -1 - person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x196ae4, -1 + person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1 + person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 99e15d905..34e5da5f1 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -39,8 +39,8 @@ UnknownScript_0x19682b: closetext end -YoungsterScript_0x196831: - jumptextfaceplayer UnknownText_0x1968a0 +CherrygroveMartYoungsterScript: + jumptextfaceplayer CherrygroveMartYoungsterText UnknownText_0x196834: text "They're fresh out" @@ -56,7 +56,7 @@ UnknownText_0x196873: cont "catch #MON!" done -UnknownText_0x1968a0: +CherrygroveMartYoungsterText: text "When I was walking" line "in the grass, a" @@ -90,4 +90,4 @@ CherrygroveMart_MapEventHeader: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1 person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1 - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x196831, -1 + person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1 diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index e3c9893fa..0a03ba707 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -14,11 +14,11 @@ CherrygrovePokecenter1F_MapScriptHeader: NurseScript_0x19696d: jumpstd pokecenternurse -FisherScript_0x196970: - jumptextfaceplayer UnknownText_0x19698a +CherrygrovePokecenter1FFisherScript: + jumptextfaceplayer CherrygrovePokecenter1FFisherText -GentlemanScript_0x196973: - jumptextfaceplayer UnknownText_0x1969c8 +CherrygrovePokecenter1FGentlemanScript: + jumptextfaceplayer CherrygrovePokecenter1FGentlemanText TeacherScript_0x196976: faceplayer @@ -36,7 +36,7 @@ UnknownScript_0x196984: closetext end -UnknownText_0x19698a: +CherrygrovePokecenter1FFisherText: text "It's great. I can" line "store any number" @@ -44,7 +44,7 @@ UnknownText_0x19698a: line "it's all free." done -UnknownText_0x1969c8: +CherrygrovePokecenter1FGentlemanText: text "That PC is free" line "for any trainer" cont "to use." @@ -87,6 +87,6 @@ CherrygrovePokecenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x19696d, -1 - person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x196970, -1 - person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x196973, -1 + person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1 + person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1 person_event SPRITE_TEACHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x196976, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index eb2036ece..80aac3499 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -120,8 +120,8 @@ CianwoodCityPokefanM: CianwoodCityLass: jumptextfaceplayer CianwoodCityLassText -UnknownScript_0x1a00bc: - jumptextfaceplayer UnknownText_0x1a03cc +CianwoodCityUnknownScript: + jumptextfaceplayer CianwoodCityUnknownText CianwoodCitySign: jumptext CianwoodCitySignText @@ -267,7 +267,7 @@ CianwoodCityLassText: done ; possibly unused -UnknownText_0x1a03cc: +CianwoodCityUnknownText: text "There are several" line "islands between" cont "here and OLIVINE." diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 9faa5e897..5e136bf71 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -10,19 +10,19 @@ CianwoodLugiaSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -TeacherScript_0x9e1b0: - jumptextfaceplayer UnknownText_0x9e1bc +CianwoodLugiaSpeechHouseTeacherScript: + jumptextfaceplayer CianwoodLugiaSpeechHouseTeacherText -LassScript_0x9e1b3: - jumptextfaceplayer UnknownText_0x9e23f +CianwoodLugiaSpeechHouseLassScript: + jumptextfaceplayer CianwoodLugiaSpeechHouseLassText -TwinScript_0x9e1b6: - jumptextfaceplayer UnknownText_0x9e2a9 +CianwoodLugiaSpeechHouseTwinScript: + jumptextfaceplayer CianwoodLugiaSpeechHouseTwinText CianwoodLugiaSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x9e1bc: +CianwoodLugiaSpeechHouseTeacherText: text "You came from" line "OLIVINE?" @@ -36,7 +36,7 @@ UnknownText_0x9e1bc: cont "them." done -UnknownText_0x9e23f: +CianwoodLugiaSpeechHouseLassText: text "I heard that you" line "can only see it if" @@ -48,7 +48,7 @@ UnknownText_0x9e23f: cont "creature." done -UnknownText_0x9e2a9: +CianwoodLugiaSpeechHouseTwinText: text "I've heard that" line "the whirlpools" @@ -80,6 +80,6 @@ CianwoodLugiaSpeechHouse_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x9e1b0, -1 - person_event SPRITE_LASS, 5, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x9e1b3, -1 - person_event SPRITE_TWIN, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TwinScript_0x9e1b6, -1 + person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1 + person_event SPRITE_LASS, 5, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1 + person_event SPRITE_TWIN, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1 diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index 4671836b7..bcc8e1256 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -14,8 +14,8 @@ CianwoodPokecenter1F_MapScriptHeader: NurseScript_0x9dbcf: jumpstd pokecenternurse -LassScript_0x9dbd2: - jumptextfaceplayer UnknownText_0x9dbed +CianwoodPokecenter1FLassScript: + jumptextfaceplayer CianwoodPokecenter1FLassText CianwoodGymGuyScript: faceplayer @@ -34,10 +34,10 @@ CianwoodGymGuyScript: closetext end -SuperNerdScript_0x9dbea: - jumptextfaceplayer UnknownText_0x9ded7 +CianwoodPokecenter1FSuperNerdScript: + jumptextfaceplayer CianwoodPokecenter1FSuperNerdText -UnknownText_0x9dbed: +CianwoodPokecenter1FLassText: text "Did you meet the" line "#MANIAC?" @@ -117,7 +117,7 @@ UnknownText_0x9de66: cont "gotta crank it up!" done -UnknownText_0x9ded7: +CianwoodPokecenter1FSuperNerdText: text "I love showing off" line "the #MON that" @@ -150,6 +150,6 @@ CianwoodPokecenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1 - person_event SPRITE_LASS, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x9dbd2, -1 + person_event SPRITE_LASS, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1 person_event SPRITE_GYM_GUY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1 - person_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x9dbea, -1 + person_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1 diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index 97f240011..151b76b3e 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -13,13 +13,13 @@ CinnabarPokecenter1F_MapScriptHeader: NurseScript_0x1ab32c: jumpstd pokecenternurse -CooltrainerFScript_0x1ab32f: - jumptextfaceplayer UnknownText_0x1ab335 +CinnabarPokecenter1FCooltrainerFScript: + jumptextfaceplayer CinnabarPokecenter1FCooltrainerFText -FisherScript_0x1ab332: - jumptextfaceplayer UnknownText_0x1ab37f +CinnabarPokecenter1FFisherScript: + jumptextfaceplayer CinnabarPokecenter1FFisherText -UnknownText_0x1ab335: +CinnabarPokecenter1FCooltrainerFText: text "CINNABAR GYM's" line "BLAINE apparently" @@ -28,7 +28,7 @@ UnknownText_0x1ab335: cont "cave…" done -UnknownText_0x1ab37f: +CinnabarPokecenter1FFisherText: text "It's been a year" line "since the volcano" cont "erupted." @@ -53,5 +53,5 @@ CinnabarPokecenter1F_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1ab32f, -1 - person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1ab332, -1 + person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1 + person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index af89fb903..8449b41bb 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -10,8 +10,8 @@ CopycatsHouse1F_MapScriptHeader: .MapCallbacks: db 0 -PokefanMScript_0x18ad13: - jumptextfaceplayer UnknownText_0x18ad34 +CopycatsHouse1FPokefanMScript: + jumptextfaceplayer CopycatsHouse1FPokefanMText PokefanFScript_0x18ad16: faceplayer @@ -37,7 +37,7 @@ ClefairyScript_0x18ad2a: closetext end -UnknownText_0x18ad34: +CopycatsHouse1FPokefanMText: text "My daughter likes" line "to mimic people." @@ -90,6 +90,6 @@ CopycatsHouse1F_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x18ad13, -1 + person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1 person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1 person_event SPRITE_CLEFAIRY, 6, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index f2e5aea81..96324b446 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -17,9 +17,9 @@ DanceTheatre_MapScriptHeader: db 0 TrainerKimono_girlNaoko2: - trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, 0, Kimono_girlNaoko2Script + trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, 0, .Script -Kimono_girlNaoko2Script: +.Script: end_if_just_battled opentext writetext Kimono_girlNaoko2AfterBattleText @@ -28,9 +28,9 @@ Kimono_girlNaoko2Script: end TrainerKimono_girlSayo: - trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, 0, Kimono_girlSayoScript + trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, 0, .Script -Kimono_girlSayoScript: +.Script: end_if_just_battled opentext writetext Kimono_girlSayoAfterBattleText @@ -39,9 +39,9 @@ Kimono_girlSayoScript: end TrainerKimono_girlZuki: - trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, 0, Kimono_girlZukiScript + trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, 0, .Script -Kimono_girlZukiScript: +.Script: end_if_just_battled opentext writetext Kimono_girlZukiAfterBattleText @@ -50,9 +50,9 @@ Kimono_girlZukiScript: end TrainerKimono_girlKuni: - trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, 0, Kimono_girlKuniScript + trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, 0, .Script -Kimono_girlKuniScript: +.Script: end_if_just_battled opentext writetext Kimono_girlKuniAfterBattleText @@ -61,9 +61,9 @@ Kimono_girlKuniScript: end TrainerKimono_girlMiki: - trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, 0, Kimono_girlMikiScript + trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, 0, .Script -Kimono_girlMikiScript: +.Script: end_if_just_battled opentext writetext Kimono_girlMikiAfterBattleText @@ -128,11 +128,11 @@ RhydonScript_0x9951b: closetext end -CooltrainerMScript_0x99525: - jumptextfaceplayer UnknownText_0x99a24 +DanceTheatreCooltrainerMScript: + jumptextfaceplayer DanceTheatreCooltrainerMText -GrannyScript_0x99528: - jumptextfaceplayer UnknownText_0x99aaa +DanceTheatreGrannyScript: + jumptextfaceplayer DanceTheatreGrannyText MapDanceTheatreSignpost1Script: jumptext UnknownText_0x99b79 @@ -298,7 +298,7 @@ UnknownText_0x99a0a: line "gugogooh!" done -UnknownText_0x99a24: +DanceTheatreCooltrainerMText: text "That man's always" line "with his RHYDON." @@ -312,7 +312,7 @@ UnknownText_0x99a24: cont "#MON?" done -UnknownText_0x99aaa: +DanceTheatreGrannyText: text "The KIMONO GIRLS" line "are so beautiful…" @@ -363,5 +363,5 @@ DanceTheatre_MapEventHeader: person_event SPRITE_KIMONO_GIRL, 2, 11, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 0, TrainerKimono_girlMiki, -1 person_event SPRITE_GENTLEMAN, 10, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x994c6, -1 person_event SPRITE_RHYDON, 8, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, RhydonScript_0x9951b, -1 - person_event SPRITE_COOLTRAINER_M, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x99525, -1 - person_event SPRITE_GRANNY, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x99528, -1 + person_event SPRITE_COOLTRAINER_M, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, DanceTheatreCooltrainerMScript, -1 + person_event SPRITE_GRANNY, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index ead75b1d8..88b66a289 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -10,20 +10,20 @@ DarkCaveBlackthornEntrance_MapScriptHeader: .MapCallbacks: db 0 -PharmacistScript_0x18c720: +DarkCaveBlackthornEntrancePharmacistScript: faceplayer opentext checkevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE - iftrue UnknownScript_0x18c735 - writetext UnknownText_0x18c73f + iftrue .GotBlackglasses + writetext DarkCaveBlackthornEntrancePharmacistText1 buttonsound verbosegiveitem BLACKGLASSES - iffalse UnknownScript_0x18c739 + iffalse .PackFull setevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE -UnknownScript_0x18c735: - writetext UnknownText_0x18c80c +.GotBlackglasses: + writetext DarkCaveBlackthornEntrancePharmacistText2 waitbutton -UnknownScript_0x18c739: +.PackFull: closetext end @@ -33,7 +33,7 @@ DarkCaveBlackthornEntranceRevive: DarkCaveBlackthornEntranceTMSnore: itemball TM_SNORE -UnknownText_0x18c73f: +DarkCaveBlackthornEntrancePharmacistText1: text "Whoa! You startled" line "me there!" @@ -55,7 +55,7 @@ UnknownText_0x18c73f: cont "you saw me, OK?" done -UnknownText_0x18c80c: +DarkCaveBlackthornEntrancePharmacistText2: text "BLACKGLASSES ups" line "the power of dark-" cont "type moves." @@ -78,6 +78,6 @@ DarkCaveBlackthornEntrance_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x18c720, -1 + person_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1 person_event SPRITE_POKE_BALL, 24, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE person_event SPRITE_POKE_BALL, 22, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 88aa1e90b..230610df5 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -8,14 +8,14 @@ DiglettsCave_MapScriptHeader: .MapCallbacks: db 0 -PokefanMScript_0x74002: - jumptextfaceplayer UnknownText_0x74008 +DiglettsCavePokefanMScript: + jumptextfaceplayer DiglettsCavePokefanMText DiglettsCaveHiddenMaxRevive: dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE -UnknownText_0x74008: +DiglettsCavePokefanMText: text "A bunch of DIGLETT" line "popped out of the" @@ -45,4 +45,4 @@ DiglettsCave_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKEFAN_M, 31, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x74002, -1 + person_event SPRITE_POKEFAN_M, 31, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index d17c3c4a3..c41fb07ed 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -84,9 +84,9 @@ DragonsDenB1F_ClairTrigger: end TrainerCooltrainermDarin: - trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, CooltrainermDarinScript + trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, .Script -CooltrainermDarinScript: +.Script: end_if_just_battled opentext writetext CooltrainermDarinAfterBattleText @@ -95,9 +95,9 @@ CooltrainermDarinScript: end TrainerCooltrainerfCara: - trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, CooltrainerfCaraScript + trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, .Script -CooltrainerfCaraScript: +.Script: end_if_just_battled opentext writetext CooltrainerfCaraAfterBattleText @@ -106,9 +106,9 @@ CooltrainerfCaraScript: end TrainerTwinsLeaandpia1: - trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, TwinsLeaandpia1Script + trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, .Script -TwinsLeaandpia1Script: +.Script: end_if_just_battled opentext writetext TwinsLeaandpia1AfterBattleText @@ -117,9 +117,9 @@ TwinsLeaandpia1Script: end TrainerTwinsLeaandpia2: - trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, TwinsLeaandpia2Script + trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, .Script -TwinsLeaandpia2Script: +.Script: end_if_just_battled opentext writetext TwinsLeaandpia2AfterBattleText diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 91d9689ef..f4df23dc1 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -38,29 +38,29 @@ AcademyEarl: closetext end -YoungsterScript_0x68a83: - jumptextfaceplayer UnknownText_0x68d80 +EarlsPokemonAcademyYoungster1Script: + jumptextfaceplayer EarlsPokemonAcademyYoungster1Text -GameboyKidScript_0x68a86: +EarlsPokemonAcademyGameboyKid1Script: faceplayer opentext - writetext UnknownText_0x68dda + writetext EarlsPokemonAcademyGameboyKid1Text waitbutton closetext spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN end -GameboyKidScript_0x68a91: +EarlsPokemonAcademyGameboyKid2Script: faceplayer opentext - writetext UnknownText_0x68e07 + writetext EarlsPokemonAcademyGameboyKid2Text waitbutton closetext spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN end -YoungsterScript_0x68a9c: - jumptextfaceplayer UnknownText_0x68e39 +EarlsPokemonAcademyYoungster2Script: + jumptextfaceplayer EarlsPokemonAcademyYoungster2Text AcademyBlackboard: opentext @@ -231,7 +231,7 @@ UnknownText_0x68d31: line "you must be!" done -UnknownText_0x68d80: +EarlsPokemonAcademyYoungster1Text: text "I'm taking notes" line "of the teacher's" cont "lecture." @@ -241,19 +241,19 @@ UnknownText_0x68d80: cont "blackboard too." done -UnknownText_0x68dda: +EarlsPokemonAcademyGameboyKid1Text: text "I traded my best" line "#MON to the" cont "guy beside me." done -UnknownText_0x68e07: +EarlsPokemonAcademyGameboyKid2Text: text "Huh? The #MON I" line "just got is hold-" cont "ing something!" done -UnknownText_0x68e39: +EarlsPokemonAcademyYoungster2Text: text "A #MON holding" line "a BERRY will heal" cont "itself in battle." @@ -434,8 +434,8 @@ EarlsPokemonAcademy_MapEventHeader: .PersonEvents: db 6 person_event SPRITE_FISHER, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x68a83, -1 - person_event SPRITE_GAMEBOY_KID, 11, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x68a86, -1 - person_event SPRITE_GAMEBOY_KID, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x68a91, -1 - person_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x68a9c, -1 + person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1 + person_event SPRITE_GAMEBOY_KID, 11, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1 + person_event SPRITE_GAMEBOY_KID, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1 + person_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1 person_event SPRITE_POKEDEX, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AcademyNotebook, -1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 9e2c8fa08..8d742d07a 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -19,17 +19,17 @@ EcruteakCity_MapScriptHeader: setflag ENGINE_FLYPOINT_ECRUTEAK return -GrampsScript_0x1a4009: - jumptextfaceplayer UnknownText_0x1a4105 +EcruteakCityGramps1Script: + jumptextfaceplayer EcruteakCityGramps1Text -GrampsScript_0x1a400c: - jumptextfaceplayer UnknownText_0x1a4147 +EcruteakCityGramps2Script: + jumptextfaceplayer EcruteakCityGramps2Text -GrampsScript_0x1a400f: - jumptextfaceplayer UnknownText_0x1a43cb +EcruteakCityGramps3Script: + jumptextfaceplayer EcruteakCityGramps3Text -LassScript_0x1a4012: - jumptextfaceplayer UnknownText_0x1a41db +EcruteakCityLassScript: + jumptextfaceplayer EcruteakCityLassText LassScript_0x1a4015: faceplayer @@ -63,8 +63,8 @@ UnknownScript_0x1a4037: closetext end -YoungsterScript_0x1a403d: - jumptextfaceplayer UnknownText_0x1a4386 +EcruteakCityYoungsterScript: + jumptextfaceplayer EcruteakCityYoungsterText EcruteakCitySign: jumptext EcruteakCitySignText @@ -111,7 +111,7 @@ UnusedMissingDaughterText: line "do…?" done -UnknownText_0x1a4105: +EcruteakCityGramps1Text: text "ECRUTEAK used to" line "have two towers:" @@ -119,7 +119,7 @@ UnknownText_0x1a4105: line "east and west." done -UnknownText_0x1a4147: +EcruteakCityGramps2Text: text "Ah, child." line "Have you learned" @@ -134,7 +134,7 @@ UnknownText_0x1a4147: cont "nice, I hear." done -UnknownText_0x1a41db: +EcruteakCityLassText: text "I'm going to prac-" line "tice at the DANCE" @@ -181,7 +181,7 @@ UnknownText_0x1a4325: cont "night again." done -UnknownText_0x1a4386: +EcruteakCityYoungsterText: text "I hear #MON are" line "rampaging at the" @@ -189,7 +189,7 @@ UnknownText_0x1a4386: line "like to see that." done -UnknownText_0x1a43cb: +EcruteakCityGramps3Text: text "In the distant" line "past…" @@ -297,10 +297,10 @@ EcruteakCity_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_GRAMPS, 15, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a4009, -1 - person_event SPRITE_GRAMPS, 21, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a400c, -1 - person_event SPRITE_LASS, 29, 21, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x1a4012, -1 + person_event SPRITE_GRAMPS, 15, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1 + person_event SPRITE_GRAMPS, 21, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1 + person_event SPRITE_LASS, 29, 21, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, EcruteakCityLassScript, -1 person_event SPRITE_LASS, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1a4015, -1 person_event SPRITE_FISHER, 22, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1 - person_event SPRITE_YOUNGSTER, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a403d, -1 - person_event SPRITE_GRAMPS, 7, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a400f, EVENT_ECRUTEAK_CITY_GRAMPS + person_event SPRITE_YOUNGSTER, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, EcruteakCityYoungsterScript, -1 + person_event SPRITE_GRAMPS, 7, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index d2bdc64eb..1b61ecfb2 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -98,9 +98,9 @@ EcruteakGymClosed: end TrainerSageJeffrey: - trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, SageJeffreyScript + trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, .Script -SageJeffreyScript: +.Script: end_if_just_battled opentext writetext SageJeffreyAfterBattleText @@ -109,9 +109,9 @@ SageJeffreyScript: end TrainerSagePing: - trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, 0, SagePingScript + trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, 0, .Script -SagePingScript: +.Script: end_if_just_battled opentext writetext SagePingAfterBattleText @@ -120,9 +120,9 @@ SagePingScript: end TrainerMediumMartha: - trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, MediumMarthaScript + trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, .Script -MediumMarthaScript: +.Script: end_if_just_battled opentext writetext MediumMarthaAfterBattleText @@ -131,9 +131,9 @@ MediumMarthaScript: end TrainerMediumGrace: - trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, MediumGraceScript + trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, .Script -MediumGraceScript: +.Script: end_if_just_battled opentext writetext MediumGraceAfterBattleText diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 4cfc70927..2959ad3cc 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -134,8 +134,8 @@ SageScript_0x980b0: closetext end -GrampsScript_0x980c4: - jumptextfaceplayer UnknownText_0x984ab +EcruteakHouseGrampsScript: + jumptextfaceplayer EcruteakHouseGrampsText MovementData_0x980c7: fix_facing @@ -266,7 +266,7 @@ UnknownText_0x9846f: line "to the top!" done -UnknownText_0x984ab: +EcruteakHouseGrampsText: text "Two towers…" line "Two #MON…" @@ -302,4 +302,4 @@ EcruteakHouse_MapEventHeader: person_event SPRITE_SAGE, 6, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 person_event SPRITE_SAGE, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 person_event SPRITE_SAGE, 9, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE - person_event SPRITE_GRAMPS, 11, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x980c4, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + person_event SPRITE_GRAMPS, 11, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakHouseGrampsScript, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 4307a19c9..6ec0173ee 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -9,16 +9,16 @@ EcruteakLugiaSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -GrampsScript_0x99334: - jumptextfaceplayer UnknownText_0x9933d +EcruteakLugiaSpeechHouseGrampsScript: + jumptextfaceplayer EcruteakLugiaSpeechHouseGrampsText -YoungsterScript_0x99337: - jumptextfaceplayer UnknownText_0x993ec +EcruteakLugiaSpeechHouseYoungsterScript: + jumptextfaceplayer EcruteakLugiaSpeechHouseYoungsterText LugiaSpeechHouseRadio: jumpstd radio2 -UnknownText_0x9933d: +EcruteakLugiaSpeechHouseGrampsText: text "This happened when" line "I was young." @@ -36,7 +36,7 @@ UnknownText_0x9933d: line "and a dragon." done -UnknownText_0x993ec: +EcruteakLugiaSpeechHouseYoungsterText: text "Is there really a" line "#MON that big?" @@ -62,5 +62,5 @@ EcruteakLugiaSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x99334, -1 - person_event SPRITE_YOUNGSTER, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x99337, -1 + person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1 + person_event SPRITE_YOUNGSTER, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index deb35aeef..1747c1d57 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -16,13 +16,13 @@ ClerkScript_0x99c3b: closetext end -SuperNerdScript_0x99c42: - jumptextfaceplayer UnknownText_0x99c48 +EcruteakMartSuperNerdScript: + jumptextfaceplayer EcruteakMartSuperNerdText -GrannyScript_0x99c45: - jumptextfaceplayer UnknownText_0x99cd5 +EcruteakMartGrannyScript: + jumptextfaceplayer EcruteakMartGrannyText -UnknownText_0x99c48: +EcruteakMartSuperNerdText: text "My EEVEE evolved" line "into an ESPEON." @@ -37,7 +37,7 @@ UnknownText_0x99c48: line "same way…" done -UnknownText_0x99cd5: +EcruteakMartGrannyText: text "If you use REVIVE," line "a #MON that's" @@ -63,5 +63,5 @@ EcruteakMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1 - person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x99c42, -1 - person_event SPRITE_GRANNY, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x99c45, -1 + person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1 + person_event SPRITE_GRANNY, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 284fa374d..e54a9e3cd 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -116,8 +116,8 @@ SailorScript_0x751d0: closetext end -SailorScript_0x751e4: - jumptextfaceplayer UnknownText_0x753c0 +FastShip1FSailorScript: + jumptextfaceplayer FastShip1FSailorText WorriedGrandpaTriggerRight: moveperson FASTSHIP1F_GENTLEMAN, $14, $6 @@ -250,7 +250,7 @@ UnknownText_0x7534f: cont "you're sleeping." done -UnknownText_0x753c0: +FastShip1FSailorText: text "The passengers are" line "all trainers." @@ -316,5 +316,5 @@ FastShip1F_MapEventHeader: db 4 person_event SPRITE_SAILOR, 2, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x75160, -1 person_event SPRITE_SAILOR, 7, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x751d0, -1 - person_event SPRITE_SAILOR, 17, 22, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x751e4, -1 + person_event SPRITE_SAILOR, 17, 22, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FastShip1FSailorScript, -1 person_event SPRITE_GENTLEMAN, 6, 19, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 951b1c737..0069b5a86 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -94,9 +94,9 @@ UnknownScript_0x767a0: end TrainerSailorJeff: - trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, SailorJeffScript + trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, .Script -SailorJeffScript: +.Script: end_if_just_battled opentext writetext SailorJeffAfterBattleText @@ -105,9 +105,9 @@ SailorJeffScript: end TrainerPicnickerDebra: - trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, PicnickerDebraScript + trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, .Script -PicnickerDebraScript: +.Script: end_if_just_battled opentext writetext PicnickerDebraAfterBattleText @@ -116,9 +116,9 @@ PicnickerDebraScript: end TrainerJugglerFritz: - trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, JugglerFritzScript + trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, .Script -JugglerFritzScript: +.Script: end_if_just_battled opentext writetext JugglerFritzAfterBattleText @@ -127,9 +127,9 @@ JugglerFritzScript: end TrainerSailorGarrett: - trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, SailorGarrettScript + trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, .Script -SailorGarrettScript: +.Script: end_if_just_battled opentext writetext SailorGarrettAfterBattleText @@ -138,9 +138,9 @@ SailorGarrettScript: end TrainerFisherJonah: - trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, FisherJonahScript + trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, .Script -FisherJonahScript: +.Script: end_if_just_battled opentext writetext FisherJonahAfterBattleText @@ -149,9 +149,9 @@ FisherJonahScript: end TrainerBlackbeltWai: - trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, BlackbeltWaiScript + trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, .Script -BlackbeltWaiScript: +.Script: end_if_just_battled opentext writetext BlackbeltWaiAfterBattleText @@ -160,9 +160,9 @@ BlackbeltWaiScript: end TrainerSailorKenneth: - trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, SailorKennethScript + trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, .Script -SailorKennethScript: +.Script: end_if_just_battled opentext writetext SailorKennethAfterBattleText @@ -171,9 +171,9 @@ SailorKennethScript: end TrainerTeacherShirley: - trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, TeacherShirleyScript + trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, .Script -TeacherShirleyScript: +.Script: end_if_just_battled opentext writetext TeacherShirleyAfterBattleText @@ -182,9 +182,9 @@ TeacherShirleyScript: end TrainerSchoolboyNate: - trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, SchoolboyNateScript + trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, .Script -SchoolboyNateScript: +.Script: end_if_just_battled opentext writetext SchoolboyNateAfterBattleText @@ -193,9 +193,9 @@ SchoolboyNateScript: end TrainerSchoolboyRicky: - trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, SchoolboyRickyScript + trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, .Script -SchoolboyRickyScript: +.Script: end_if_just_battled opentext writetext SchoolboyRickyAfterBattleText diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 682fe8596..2f141db45 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -15,9 +15,9 @@ FastShipCabins_NNW_NNE_NE_MapScriptHeader: db 0 TrainerCooltrainermSean: - trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, CooltrainermSeanScript + trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script -CooltrainermSeanScript: +.Script: end_if_just_battled opentext writetext CooltrainermSeanAfterBattleText @@ -26,9 +26,9 @@ CooltrainermSeanScript: end TrainerCooltrainerfCarol: - trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, CooltrainerfCarolScript + trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, .Script -CooltrainerfCarolScript: +.Script: end_if_just_battled opentext writetext CooltrainerfCarolAfterBattleText @@ -37,9 +37,9 @@ CooltrainerfCarolScript: end TrainerPokemaniacEthan: - trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, PokemaniacEthanScript + trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, .Script -PokemaniacEthanScript: +.Script: end_if_just_battled opentext writetext PokemaniacEthanAfterBattleText @@ -48,9 +48,9 @@ PokemaniacEthanScript: end TrainerHikerNoland: - trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, HikerNolandScript + trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, .Script -HikerNolandScript: +.Script: end_if_just_battled opentext writetext HikerNolandAfterBattleText @@ -59,9 +59,9 @@ HikerNolandScript: end TrainerGentlemanEdward: - trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, GentlemanEdwardScript + trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, .Script -GentlemanEdwardScript: +.Script: end_if_just_battled opentext writetext GentlemanEdwardAfterBattleText @@ -70,9 +70,9 @@ GentlemanEdwardScript: end TrainerBurglarCorey: - trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, BurglarCoreyScript + trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, .Script -BurglarCoreyScript: +.Script: end_if_just_battled opentext writetext BurglarCoreyAfterBattleText diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index c8fa4300b..8e0575964 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -141,9 +141,9 @@ TwinScript_0x75f6d: end TrainerPokefanmColin: - trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, PokefanmColinScript + trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, .Script -PokefanmColinScript: +.Script: end_if_just_battled opentext writetext PokefanmColinAfterBattleText @@ -152,9 +152,9 @@ PokefanmColinScript: end TrainerTwinsMegandpeg1: - trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, TwinsMegandpeg1Script + trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, .Script -TwinsMegandpeg1Script: +.Script: end_if_just_battled opentext writetext TwinsMegandpeg1AfterBattleText @@ -163,9 +163,9 @@ TwinsMegandpeg1Script: end TrainerTwinsMegandpeg2: - trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, TwinsMegandpeg2Script + trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, .Script -TwinsMegandpeg2Script: +.Script: end_if_just_battled opentext writetext TwinsMegandpeg2AfterBattleText @@ -174,9 +174,9 @@ TwinsMegandpeg2Script: end TrainerPsychicRodney: - trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, PsychicRodneyScript + trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, .Script -PsychicRodneyScript: +.Script: end_if_just_battled opentext writetext PsychicRodneyAfterBattleText @@ -185,9 +185,9 @@ PsychicRodneyScript: end TrainerPokefanmJeremy: - trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, PokefanmJeremyScript + trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, .Script -PokefanmJeremyScript: +.Script: end_if_just_battled opentext writetext PokefanmJeremyAfterBattleText @@ -196,9 +196,9 @@ PokefanmJeremyScript: end TrainerPokefanfGeorgia: - trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, PokefanfGeorgiaScript + trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, .Script -PokefanfGeorgiaScript: +.Script: end_if_just_battled opentext writetext PokefanfGeorgiaAfterBattleText @@ -207,9 +207,9 @@ PokefanfGeorgiaScript: end TrainerSupernerdShawn: - trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, SupernerdShawnScript + trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, .Script -SupernerdShawnScript: +.Script: end_if_just_battled opentext writetext SupernerdShawnAfterBattleText diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 0cd7dbe90..b1430f1c4 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -12,9 +12,9 @@ FastShipCabins_SW_SSW_NW_MapScriptHeader: db 0 TrainerFirebreatherLyle: - trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, FirebreatherLyleScript + trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script -FirebreatherLyleScript: +.Script: end_if_just_battled opentext writetext FirebreatherLyleAfterBattleText @@ -23,9 +23,9 @@ FirebreatherLyleScript: end TrainerBug_catcherKen: - trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, 0, Bug_catcherKenScript + trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, 0, .Script -Bug_catcherKenScript: +.Script: end_if_just_battled opentext writetext Bug_catcherKenAfterBattleText @@ -34,9 +34,9 @@ Bug_catcherKenScript: end TrainerBeautyCassie: - trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, BeautyCassieScript + trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, .Script -BeautyCassieScript: +.Script: end_if_just_battled opentext writetext BeautyCassieAfterBattleText @@ -45,9 +45,9 @@ BeautyCassieScript: end TrainerGuitaristClyde: - trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, GuitaristClydeScript + trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, .Script -GuitaristClydeScript: +.Script: end_if_just_battled special Mobile_DummyReturnFalse iftrue .mobile diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index 9d415f2f8..2b420775b 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -9,19 +9,19 @@ FuchsiaBillSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -PokefanFScript_0x1963bd: - jumptextfaceplayer UnknownText_0x1963c3 +FuchsiaBillSpeechHousePokefanFScript: + jumptextfaceplayer FuchsiaBillSpeechHousePokefanFText -YoungsterScript_0x1963c0: - jumptextfaceplayer UnknownText_0x1963f9 +FuchsiaBillSpeechHouseYoungsterScript: + jumptextfaceplayer FuchsiaBillSpeechHouseYoungsterText -UnknownText_0x1963c3: +FuchsiaBillSpeechHousePokefanFText: text "My grandpa is at " line "my brother BILL's" cont "on CERULEAN CAPE." done -UnknownText_0x1963f9: +FuchsiaBillSpeechHouseYoungsterText: text "I saw these weird," line "slow #MON on" cont "CYCLING ROAD." @@ -44,5 +44,5 @@ FuchsiaBillSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x1963bd, -1 - person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1963c0, -1 + person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FuchsiaBillSpeechHousePokefanFScript, -1 + person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FuchsiaBillSpeechHouseYoungsterScript, -1 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 423dfdc1a..7e123e721 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -16,13 +16,13 @@ ClerkScript_0x195ce8: closetext end -FisherScript_0x195cef: - jumptextfaceplayer UnknownText_0x195cf5 +FuchsiaMartFisherScript: + jumptextfaceplayer FuchsiaMartFisherText -CooltrainerFScript_0x195cf2: - jumptextfaceplayer UnknownText_0x195d36 +FuchsiaMartCooltrainerFScript: + jumptextfaceplayer FuchsiaMartCooltrainerFText -UnknownText_0x195cf5: +FuchsiaMartFisherText: text "I was hoping to" line "buy some SAFARI" @@ -30,7 +30,7 @@ UnknownText_0x195cf5: line "but it's closed…" done -UnknownText_0x195d36: +FuchsiaMartCooltrainerFText: text "The SAFARI ZONE" line "WARDEN's grand-" cont "daughter lives in" @@ -55,5 +55,5 @@ FuchsiaMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 - person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x195cef, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x195cf2, -1 + person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1 + person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1 diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index 422661e0b..d275eaece 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -18,11 +18,11 @@ FuchsiaPokecenter1F_MapScriptHeader: NurseScript_0x196459: jumpstd pokecenternurse -CooltrainerMScript_0x19645c: - jumptextfaceplayer UnknownText_0x196494 +FuchsiaPokecenter1FCooltrainerMScript: + jumptextfaceplayer FuchsiaPokecenter1FCooltrainerMText -CooltrainerFScript_0x19645f: - jumptextfaceplayer UnknownText_0x1964dc +FuchsiaPokecenter1FCooltrainerFScript: + jumptextfaceplayer FuchsiaPokecenter1FCooltrainerFText JanineImpersonatorScript_0x196462: faceplayer @@ -60,7 +60,7 @@ MovementData_0x196486: turn_head DOWN step_end -UnknownText_0x196494: +FuchsiaPokecenter1FCooltrainerMText: text "Hey! You have a" line "brand new kind of" cont "#DEX." @@ -69,7 +69,7 @@ UnknownText_0x196494: line "that to you?" done -UnknownText_0x1964dc: +FuchsiaPokecenter1FCooltrainerFText: text "I got quite a" line "shock at the GYM." @@ -107,6 +107,6 @@ FuchsiaPokecenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, NurseScript_0x196459, -1 - person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19645c, -1 - person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x19645f, -1 + person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1 + person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1 person_event SPRITE_JANINE_IMPERSONATOR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 48959cac8..74aedf8a7 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -6,13 +6,13 @@ const_value set 2 const GOLDENRODCITY_YOUNGSTER2 const GOLDENRODCITY_LASS const GOLDENRODCITY_GRAMPS + const GOLDENRODCITY_ROCKETSCOUT const GOLDENRODCITY_ROCKET1 const GOLDENRODCITY_ROCKET2 const GOLDENRODCITY_ROCKET3 const GOLDENRODCITY_ROCKET4 const GOLDENRODCITY_ROCKET5 const GOLDENRODCITY_ROCKET6 - const GOLDENRODCITY_ROCKET7 const GOLDENRODCITY_POKEFAN_M2 GoldenrodCity_MapScriptHeader: @@ -160,11 +160,11 @@ MoveTutor: closetext end -PokefanMScript_0x1989e3: - jumptextfaceplayer UnknownText_0x198a69 +GoldenrodCityPokefanMScript: + jumptextfaceplayer GoldenrodCityPokefanMText -YoungsterScript_0x1989e6: - jumptextfaceplayer UnknownText_0x198aa9 +GoldenrodCityYoungster1Script: + jumptextfaceplayer GoldenrodCityYoungster1Text CooltrainerFScript_0x1989e9: faceplayer @@ -198,43 +198,43 @@ CooltrainerFScript_0x1989fd: closetext end -YoungsterScript_0x198a11: - jumptextfaceplayer UnknownText_0x198c36 +GoldenrodCityYoungster2Script: + jumptextfaceplayer GoldenrodCityYoungster2Text -LassScript_0x198a14: - jumptextfaceplayer UnknownText_0x198c83 +GoldenrodCityLassScript: + jumptextfaceplayer GoldenrodCityLassText -GrampsScript_0x198a17: - jumptextfaceplayer UnknownText_0x198ccf +GoldenrodCityGrampsScript: + jumptextfaceplayer GoldenrodCityGrampsText -RocketScript_0x198a1a: +GoldenrodCityRocketScoutScript: opentext - writetext UnknownText_0x198d0d + writetext GoldenrodCityRocketScoutText1 buttonsound faceplayer - writetext UnknownText_0x198d2a + writetext GoldenrodCityRocketScoutText2 waitbutton closetext - spriteface GOLDENRODCITY_ROCKET1, UP + spriteface GOLDENRODCITY_ROCKETSCOUT, UP end -RocketScript_0x198a29: - jumptextfaceplayer UnknownText_0x198d4e +GoldenrodCityRocket1Script: + jumptextfaceplayer GoldenrodCityRocket1Text -RocketScript_0x198a2c: - jumptextfaceplayer UnknownText_0x198d6d +GoldenrodCityRocket2Script: + jumptextfaceplayer GoldenrodCityRocket2Text -RocketScript_0x198a2f: - jumptextfaceplayer UnknownText_0x198daa +GoldenrodCityRocket3Script: + jumptextfaceplayer GoldenrodCityRocket3Text -RocketScript_0x198a32: - jumptextfaceplayer UnknownText_0x198de2 +GoldenrodCityRocket4Script: + jumptextfaceplayer GoldenrodCityRocket4Text -RocketScript_0x198a35: - jumptextfaceplayer UnknownText_0x198e1f +GoldenrodCityRocket5Script: + jumptextfaceplayer GoldenrodCityRocket5Text -RocketScript_0x198a38: - jumptextfaceplayer UnknownText_0x198e4b +GoldenrodCityRocket6Script: + jumptextfaceplayer GoldenrodCityRocket6Text GoldenrodCityStationSign: jumptext GoldenrodCityStationSignText @@ -286,7 +286,7 @@ MovementData_0x198a63: step UP step_end -UnknownText_0x198a69: +GoldenrodCityPokefanMText: text "They built the new" line "RADIO TOWER to" @@ -294,7 +294,7 @@ UnknownText_0x198a69: line "creaky one." done -UnknownText_0x198aa9: +GoldenrodCityYoungster1Text: text "I know there's a" line "new BIKE SHOP, but" @@ -339,7 +339,7 @@ UnknownText_0x198c14: line "works as a radio!" done -UnknownText_0x198c36: +GoldenrodCityYoungster2Text: text "E-he-he-he…" para "I got in trouble" @@ -349,7 +349,7 @@ UnknownText_0x198c36: line "DEPT.STORE." done -UnknownText_0x198c83: +GoldenrodCityLassText: text "The man at that" line "house rates your" cont "#MON names." @@ -358,7 +358,7 @@ UnknownText_0x198c83: line "your #MON." done -UnknownText_0x198ccf: +GoldenrodCityGrampsText: text "Whew! This is one" line "big town. I don't" @@ -366,22 +366,22 @@ UnknownText_0x198ccf: line "thing is." done -UnknownText_0x198d0d: +GoldenrodCityRocketScoutText1: text "So this is the" line "RADIO TOWER…" done -UnknownText_0x198d2a: +GoldenrodCityRocketScoutText2: text "What do you want," line "you pest? Scram!" done -UnknownText_0x198d4e: +GoldenrodCityRocket1Text: text "Stay out of the" line "way! Beat it!" done -UnknownText_0x198d6d: +GoldenrodCityRocket2Text: text "Take over the" line "RADIO TOWER…" @@ -389,7 +389,7 @@ UnknownText_0x198d6d: line "your business!" done -UnknownText_0x198daa: +GoldenrodCityRocket3Text: text "#MON? They're" line "nothing more than" @@ -397,7 +397,7 @@ UnknownText_0x198daa: line "money!" done -UnknownText_0x198de2: +GoldenrodCityRocket4Text: text "Our dream will" line "soon come true…" @@ -405,13 +405,13 @@ UnknownText_0x198de2: line "struggle…" done -UnknownText_0x198e1f: +GoldenrodCityRocket5Text: text "Hey, brat! You" line "don't belong here!" cont "Get lost!" done -UnknownText_0x198e4b: +GoldenrodCityRocket6Text: text "Come taste the" line "true terror of" cont "TEAM ROCKET!" @@ -596,18 +596,18 @@ GoldenrodCity_MapEventHeader: .PersonEvents: db 15 - person_event SPRITE_POKEFAN_M, 18, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1989e3, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_YOUNGSTER, 17, 30, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1989e6, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_POKEFAN_M, 18, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_YOUNGSTER, 17, 30, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_COOLTRAINER_F, 16, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_COOLTRAINER_F, 26, 20, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_YOUNGSTER, 17, 19, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x198a11, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_LASS, 10, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x198a14, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_GRAMPS, 27, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x198a17, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_ROCKET, 16, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a1a, EVENT_GOLDENROD_CITY_ROCKET_SCOUT - person_event SPRITE_ROCKET, 20, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a29, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a2c, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 23, 16, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a2f, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 20, 29, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a32, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 7, 29, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a35, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 10, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a38, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_YOUNGSTER, 17, 19, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodCityYoungster2Script, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_LASS, 10, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodCityLassScript, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_GRAMPS, 27, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityGrampsScript, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_ROCKET, 16, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT + person_event SPRITE_ROCKET, 20, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket1Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 23, 16, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket3Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 20, 29, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 7, 29, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 10, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_POKEFAN_M, 22, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 51c387d07..7b9671054 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -11,17 +11,17 @@ GoldenrodDeptStore1F_MapScriptHeader: .MapCallbacks: db 0 -ReceptionistScript_0x55981: - jumptextfaceplayer UnknownText_0x55993 +GoldenrodDeptStore1FReceptionistScript: + jumptextfaceplayer GoldenrodDeptStore1FReceptionistText -GentlemanScript_0x55984: - jumptextfaceplayer UnknownText_0x559b7 +GoldenrodDeptStore1FGentlemanScript: + jumptextfaceplayer GoldenrodDeptStore1FGentlemanText -PokefanFScript_0x55987: - jumptextfaceplayer UnknownText_0x55a1a +GoldenrodDeptStore1FPokefanFScript: + jumptextfaceplayer GoldenrodDeptStore1FPokefanFText -BugCatcherScript_0x5598a: - jumptextfaceplayer UnknownText_0x55a3a +GoldenrodDeptStore1FBugCatcherScript: + jumptextfaceplayer GoldenrodDeptStore1FBugCatcherText GoldenrodDeptStore1FDirectory: jumptext GoldenrodDeptStore1FDirectoryText @@ -29,12 +29,12 @@ GoldenrodDeptStore1FDirectory: GoldenrodDeptStore1FElevatorButton: jumpstd elevatorbutton -UnknownText_0x55993: +GoldenrodDeptStore1FReceptionistText: text "Welcome to GOLDEN-" line "ROD DEPT.STORE." done -UnknownText_0x559b7: +GoldenrodDeptStore1FGentlemanText: text "The DEPT.STORE" line "has a decent se-" cont "lection." @@ -46,12 +46,12 @@ UnknownText_0x559b7: line "prizes." done -UnknownText_0x55a1a: +GoldenrodDeptStore1FPokefanFText: text "I'm raring to shop" line "again today!" done -UnknownText_0x55a3a: +GoldenrodDeptStore1FBugCatcherText: text "Mom's good at" line "bargain hunting." @@ -99,7 +99,7 @@ GoldenrodDeptStore1F_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x55981, -1 - person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x55987, -1 - person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x5598a, -1 - person_event SPRITE_GENTLEMAN, 5, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x55984, -1 + person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1 + person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1 + person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1 + person_event SPRITE_GENTLEMAN, 5, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index b6cda7cb1..41e929bda 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -26,14 +26,14 @@ ClerkScript_0x55b65: closetext end -YoungsterScript_0x55b6d: - jumptextfaceplayer UnknownText_0x55c25 +GoldenrodDeptStore2FYoungsterScript: + jumptextfaceplayer GoldenrodDeptStore2FYoungsterText -CooltrainerFScript_0x55b70: - jumptextfaceplayer UnknownText_0x55c7b +GoldenrodDeptStore2FCooltrainerFScript: + jumptextfaceplayer GoldenrodDeptStore2FCooltrainerFText -GentlemanScript_0x55b73: - jumptextfaceplayer UnknownText_0x55cb7 +GoldenrodDeptStore2FGentlemanScript: + jumptextfaceplayer GoldenrodDeptStore2FGentlemanText GoldenrodDeptStore2FDirectory: jumptext GoldenrodDeptStore2FDirectoryText @@ -62,7 +62,7 @@ UnknownText_0x55bd3: cont "techniques." done -UnknownText_0x55c25: +GoldenrodDeptStore2FYoungsterText: text "#GEAR can store" line "up to ten phone" cont "numbers." @@ -72,7 +72,7 @@ UnknownText_0x55c25: cont "to keep." done -UnknownText_0x55c7b: +GoldenrodDeptStore2FCooltrainerFText: text "I got my ABRA at" line "the GAME CORNER." @@ -80,7 +80,7 @@ UnknownText_0x55c7b: line "partner." done -UnknownText_0x55cb7: +GoldenrodDeptStore2FGentlemanText: text "This DEPT.STORE" line "makes me realize" @@ -122,6 +122,6 @@ GoldenrodDeptStore2F_MapEventHeader: db 5 person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1 person_event SPRITE_CLERK, 6, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1 - person_event SPRITE_YOUNGSTER, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x55b6d, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x55b70, -1 - person_event SPRITE_GENTLEMAN, 6, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x55b73, -1 + person_event SPRITE_YOUNGSTER, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1 + person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1 + person_event SPRITE_GENTLEMAN, 6, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index a9cd1dc15..ec07b0a72 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -17,11 +17,11 @@ ClerkScript_0x55db8: closetext end -SuperNerdScript_0x55dc0: - jumptextfaceplayer UnknownText_0x55dcc +GoldenrodDeptStore3FSuperNerdScript: + jumptextfaceplayer GoldenrodDeptStore3FSuperNerdText -RockerScript_0x55dc3: - jumptextfaceplayer UnknownText_0x55e15 +GoldenrodDeptStore3FRockerScript: + jumptextfaceplayer GoldenrodDeptStore3FRockerText GoldenrodDeptStore3FDirectory: jumptext GoldenrodDeptStore3FDirectoryText @@ -29,7 +29,7 @@ GoldenrodDeptStore3FDirectory: GoldenrodDeptStore3FElevatorButton: jumpstd elevatorbutton -UnknownText_0x55dcc: +GoldenrodDeptStore3FSuperNerdText: text "I, I, I'm really" line "impatient!" @@ -38,7 +38,7 @@ UnknownText_0x55dcc: cont "my #MON." done -UnknownText_0x55e15: +GoldenrodDeptStore3FRockerText: text "Hey! When you bat-" line "tle, do you use X" cont "SPECIAL?" @@ -77,5 +77,5 @@ GoldenrodDeptStore3F_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1 - person_event SPRITE_SUPER_NERD, 5, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x55dc0, -1 - person_event SPRITE_ROCKER, 5, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RockerScript_0x55dc3, -1 + person_event SPRITE_SUPER_NERD, 5, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1 + person_event SPRITE_ROCKER, 5, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 61c5ff120..8e8fc4714 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -18,11 +18,11 @@ ClerkScript_0x55ee9: closetext end -CooltrainerMScript_0x55ef1: - jumptextfaceplayer UnknownText_0x55f08 +GoldenrodDeptStore4FCooltrainerMScript: + jumptextfaceplayer GoldenrodDeptStore4FCooltrainerMText -BugCatcherScript_0x55ef4: - jumptextfaceplayer UnknownText_0x55f52 +GoldenrodDeptStore4FBugCatcherScript: + jumptextfaceplayer GoldenrodDeptStore4FBugCatcherText GameboyKidScript_0x55ef7: faceplayer @@ -39,7 +39,7 @@ GoldenrodDeptStore4FDirectory: GoldenrodDeptStore4FElevatorButton: jumpstd elevatorbutton -UnknownText_0x55f08: +GoldenrodDeptStore4FCooltrainerMText: text "Hey. I love strong" line "#MON." @@ -48,7 +48,7 @@ UnknownText_0x55f08: cont "their ATTACK." done -UnknownText_0x55f52: +GoldenrodDeptStore4FBugCatcherText: text "IRON adds to your" line "#MON's DEFENSE." done @@ -98,6 +98,6 @@ GoldenrodDeptStore4F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1 - person_event SPRITE_COOLTRAINER_M, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x55ef1, -1 - person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x55ef4, -1 + person_event SPRITE_COOLTRAINER_M, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1 + person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1 person_event SPRITE_GAMEBOY_KID, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 0c33b44a3..e4b99959e 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -120,8 +120,8 @@ Carrie: closetext end -LassScript_0x56130: - jumptextfaceplayer UnknownText_0x562ad +GoldenrodDeptStore5FLassScript: + jumptextfaceplayer GoldenrodDeptStore5FLassText Mike: faceplayer @@ -131,8 +131,8 @@ Mike: closetext end -PokefanMScript_0x5613a: - jumptextfaceplayer UnknownText_0x562f3 +GoldenrodDeptStore5FPokefanMScript: + jumptextfaceplayer GoldenrodDeptStore5FPokefanMText GoldenrodDeptStore5FDirectory: jumptext GoldenrodDeptStore5FDirectoryText @@ -189,7 +189,7 @@ UnknownText_0x56279: cont "Game Boy Color." done -UnknownText_0x562ad: +GoldenrodDeptStore5FLassText: text "On Sundays, a lady" line "comes to check out" cont "#MON." @@ -198,7 +198,7 @@ UnknownText_0x562ad: line "away TMs!" done -UnknownText_0x562f3: +GoldenrodDeptStore5FPokefanMText: text "You can't rename a" line "#MON you get in" cont "a trade." @@ -238,8 +238,8 @@ GoldenrodDeptStore5F_MapEventHeader: .PersonEvents: db 6 person_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1 - person_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x56130, -1 + person_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1 person_event SPRITE_COOLTRAINER_M, 3, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Mike, -1 - person_event SPRITE_POKEFAN_M, 5, 13, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x5613a, -1 + person_event SPRITE_POKEFAN_M, 5, 13, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1 person_event SPRITE_TWIN, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Carrie, -1 person_event SPRITE_RECEPTIONIST, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index b8b683561..18c936e81 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -84,11 +84,11 @@ GoldenrodVendingMachine: db "CANCEL@" -LassScript_0x564bf: - jumptextfaceplayer UnknownText_0x5654b +GoldenrodDeptStore6FLassScript: + jumptextfaceplayer GoldenrodDeptStore6FLassText -SuperNerdScript_0x564c2: - jumptextfaceplayer UnknownText_0x565ca +GoldenrodDeptStore6FSuperNerdScript: + jumptextfaceplayer GoldenrodDeptStore6FSuperNerdText GoldenrodDeptStore6FDirectory: jumptext GoldenrodDeptStore6FDirectoryText @@ -119,7 +119,7 @@ GoldenrodVendingNoSpaceText: line "room for stuff." done -UnknownText_0x5654b: +GoldenrodDeptStore6FLassText: text "Do you listen to" line "LUCKY CHANNEL?" @@ -133,7 +133,7 @@ UnknownText_0x5654b: line "numbers." done -UnknownText_0x565ca: +GoldenrodDeptStore6FSuperNerdText: text "If you're tired," line "try the vending" cont "machine's drinks." @@ -173,5 +173,5 @@ GoldenrodDeptStore6F_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_LASS, 2, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x564bf, -1 - person_event SPRITE_SUPER_NERD, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x564c2, -1 + person_event SPRITE_LASS, 2, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1 + person_event SPRITE_SUPER_NERD, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 859e5e6dd..4e6a3b03e 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -46,14 +46,14 @@ UnknownScript_0x7d7ac: clearevent EVENT_WAREHOUSE_BLOCKED_OFF return -BlackBeltScript_0x7d7b0: - jumptextfaceplayer UnknownText_0x7d7cb +GoldenrodDeptStoreB1FBlackBelt1Script: + jumptextfaceplayer GoldenrodDeptStoreB1FBlackBelt1Text -BlackBeltScript_0x7d7b3: - jumptextfaceplayer UnknownText_0x7d82c +GoldenrodDeptStoreB1FBlackBelt2Script: + jumptextfaceplayer GoldenrodDeptStoreB1FBlackBelt2Text -BlackBeltScript_0x7d7b6: - jumptextfaceplayer UnknownText_0x7d875 +GoldenrodDeptStoreB1FBlackBelt3Script: + jumptextfaceplayer GoldenrodDeptStoreB1FBlackBelt3Text MachopScript_0x7d7b9: opentext @@ -75,7 +75,7 @@ GoldenrodDeptStoreB1FBurnHeal: GoldenrodDeptStoreB1FUltraBall: itemball ULTRA_BALL -UnknownText_0x7d7cb: +GoldenrodDeptStoreB1FBlackBelt1Text: text "Hey, kid! You're" line "holding us up!" @@ -86,7 +86,7 @@ UnknownText_0x7d7cb: line "one can see us!" done -UnknownText_0x7d82c: +GoldenrodDeptStoreB1FBlackBelt2Text: text "I lose my passion" line "for work if some-" cont "one's watching." @@ -95,7 +95,7 @@ UnknownText_0x7d82c: line "scoot!" done -UnknownText_0x7d875: +GoldenrodDeptStoreB1FBlackBelt3Text: text "Oohah! Oohah!" para "The stuff on the" @@ -131,7 +131,7 @@ GoldenrodDeptStoreB1F_MapEventHeader: person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL person_event SPRITE_POKE_BALL, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL - person_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b0, -1 - person_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b3, -1 - person_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b6, -1 + person_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1 + person_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1 + person_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1 person_event SPRITE_MACHOP, 7, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1 diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 3a12e7707..82f14b404 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -62,8 +62,8 @@ GoldenrodDeptStoreElevator_MapEventHeader: .Warps: db 2 - warp_def $3, $1, 255, GOLDENROD_DEPT_STORE_1F - warp_def $3, $2, 255, GOLDENROD_DEPT_STORE_1F + warp_def $3, $1, -1, GOLDENROD_DEPT_STORE_1F + warp_def $3, $2, -1, GOLDENROD_DEPT_STORE_1F .XYTriggers: db 0 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index ed61d935f..bfdc3a527 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -45,8 +45,8 @@ ClerkScript_0x5673f: closetext end -PokefanFScript_0x56746: - jumptextfaceplayer UnknownText_0x5677f +GoldenrodDeptStoreRoofPokefanFScript: + jumptextfaceplayer GoldenrodDeptStoreRoofPokefanFText FisherScript_0x56749: faceplayer @@ -57,8 +57,8 @@ FisherScript_0x56749: spriteface GOLDENRODDEPTSTOREROOF_FISHER, UP end -TwinScript_0x56754: - jumptextfaceplayer UnknownText_0x56839 +GoldenrodDeptStoreRoofTwinScript: + jumptextfaceplayer GoldenrodDeptStoreRoofTwinText SuperNerdScript_0x56757: opentext @@ -73,14 +73,14 @@ SuperNerdScript_0x56757: spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT end -PokefanMScript_0x5676a: - jumptextfaceplayer UnknownText_0x5688e +GoldenrodDeptStoreRoofPokefanMScript: + jumptextfaceplayer GoldenrodDeptStoreRoofPokefanMText -TeacherScript_0x5676d: - jumptextfaceplayer UnknownText_0x56901 +GoldenrodDeptStoreRoofTeacherScript: + jumptextfaceplayer GoldenrodDeptStoreRoofTeacherText -BugCatcherScript_0x56770: - jumptextfaceplayer UnknownText_0x56942 +GoldenrodDeptStoreRoofBugCatcherScript: + jumptextfaceplayer GoldenrodDeptStoreRoofBugCatcherText Binoculars1: jumptext Binoculars1Text @@ -94,7 +94,7 @@ Binoculars3: PokeDollVendingMachine: jumptext PokeDollVendingMachineText -UnknownText_0x5677f: +GoldenrodDeptStoreRoofPokefanFText: text "Whew, I'm tired." para "I sometimes come" @@ -116,7 +116,7 @@ UnknownText_0x567d2: line "dolls!" done -UnknownText_0x56839: +GoldenrodDeptStoreRoofTwinText: text "They have bargain" line "sales here every" cont "so often." @@ -131,7 +131,7 @@ UnknownText_0x56871: line "bothering me?" done -UnknownText_0x5688e: +GoldenrodDeptStoreRoofPokefanMText: text "There's something" line "I really want, but" @@ -143,7 +143,7 @@ UnknownText_0x5688e: cont "I've collected…" done -UnknownText_0x56901: +GoldenrodDeptStoreRoofTeacherText: text "Oh, everything is" line "so cheap!" @@ -151,7 +151,7 @@ UnknownText_0x56901: line "my PACK's crammed!" done -UnknownText_0x56942: +GoldenrodDeptStoreRoofBugCatcherText: text "My #MON always" line "get paralyzed or" @@ -232,10 +232,10 @@ GoldenrodDeptStoreRoof_MapEventHeader: .PersonEvents: db 8 person_event SPRITE_CLERK, 4, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_POKEFAN_F, 3, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x56746, -1 + person_event SPRITE_POKEFAN_F, 3, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1 person_event SPRITE_FISHER, 1, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x56749, -1 - person_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x56754, EVENT_GOLDENROD_SALE_ON + person_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON person_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON - person_event SPRITE_POKEFAN_M, 0, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x5676a, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5676d, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x56770, EVENT_GOLDENROD_SALE_OFF + person_event SPRITE_POKEFAN_M, 0, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF + person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF + person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index c8f47f6dc..3551b7ee7 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -93,9 +93,9 @@ GoldenrodGymTriggerRockets: jumpstd radiotowerrockets TrainerLassCarrie: - trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, LassCarrieScript + trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script -LassCarrieScript: +.Script: end_if_just_battled opentext writetext LassCarrieAfterBattleText @@ -117,9 +117,9 @@ WhitneyCriesScript: end TrainerLassBridget: - trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, LassBridgetScript + trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, .Script -LassBridgetScript: +.Script: end_if_just_battled opentext writetext LassBridgetAfterBattleText @@ -128,9 +128,9 @@ LassBridgetScript: end TrainerBeautyVictoria: - trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, BeautyVictoriaScript + trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, .Script -BeautyVictoriaScript: +.Script: end_if_just_battled opentext writetext BeautyVictoriaAfterBattleText @@ -139,9 +139,9 @@ BeautyVictoriaScript: end TrainerBeautySamantha: - trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, BeautySamanthaScript + trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, .Script -BeautySamanthaScript: +.Script: end_if_just_battled opentext writetext BeautySamanthaAfterBattleText diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 9b082c082..7455a1eb1 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -59,11 +59,11 @@ UnknownScript_0x54991: closetext end -PokefanMScript_0x54997: - jumptextfaceplayer UnknownText_0x54b04 +GoldenrodHappinessRaterPokefanMScript: + jumptextfaceplayer GoldenrodHappinessRaterPokefanMText -TwinScript_0x5499a: - jumptextfaceplayer UnknownText_0x54b67 +GoldenrodHappinessRaterTwinScript: + jumptextfaceplayer GoldenrodHappinessRaterTwinText HappinessRatersHouseBookshelf: jumpstd difficultbookshelf @@ -118,7 +118,7 @@ UnknownText_0x54ad1: cont "It looks mean." done -UnknownText_0x54b04: +GoldenrodHappinessRaterPokefanMText: text "I keep losing in" line "battles, and my" @@ -130,7 +130,7 @@ UnknownText_0x54b04: cont "like me much…" done -UnknownText_0x54b67: +GoldenrodHappinessRaterTwinText: text "When I use an item" line "on my #MON, it" cont "acts really glad!" @@ -157,5 +157,5 @@ GoldenrodHappinessRater_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x54953, -1 - person_event SPRITE_POKEFAN_M, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x54997, -1 - person_event SPRITE_TWIN, 6, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x5499a, -1 + person_event SPRITE_POKEFAN_M, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1 + person_event SPRITE_TWIN, 6, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index d94c5a3bd..a00b47e11 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -68,8 +68,8 @@ Script_ArriveFromSaffron: closetext end -GentlemanScript_0x55143: - jumptextfaceplayer UnknownText_0x552a3 +GoldenrodMagnetTrainStationGentlemanScript: + jumptextfaceplayer GoldenrodMagnetTrainStationGentlemanText MovementData_0x55146: step UP @@ -150,7 +150,7 @@ UnknownText_0x5526a: line "again." done -UnknownText_0x552a3: +GoldenrodMagnetTrainStationGentlemanText: text "I'm the PRESIDENT." para "My dream was to" @@ -185,4 +185,4 @@ GoldenrodMagnetTrainStation_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_OFFICER, 9, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1 - person_event SPRITE_GENTLEMAN, 14, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x55143, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN + person_event SPRITE_GENTLEMAN, 14, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index 216fba7c1..c785510ed 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -22,7 +22,7 @@ GoldenrodNameRaterBookshelf: GoldenrodNameRaterRadio: jumpstd radio2 -INCLUDE "text/sweethoney.asm" +INCLUDE "text/unused_sweet_honey.asm" GoldenrodNameRater_MapEventHeader: ; filler diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 809970862..3eb250ff1 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -9,11 +9,11 @@ GoldenrodPPSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -FisherScript_0x5564a: - jumptextfaceplayer UnknownText_0x55659 +GoldenrodPPSpeechHouseFisherScript: + jumptextfaceplayer GoldenrodPPSpeechHouseFisherText -LassScript_0x5564d: - jumptextfaceplayer UnknownText_0x556ca +GoldenrodPPSpeechHouseLassScript: + jumptextfaceplayer GoldenrodPPSpeechHouseLassText GoldenrodPPSpeechHouseBookshelf2: jumpstd difficultbookshelf @@ -24,7 +24,7 @@ GoldenrodPPSpeechHouseBookshelf1: GoldenrodPPSpeechHouseRadio: jumpstd radio2 -UnknownText_0x55659: +GoldenrodPPSpeechHouseFisherText: text "Once while I was" line "battling, my" @@ -38,7 +38,7 @@ UnknownText_0x55659: line "gone." done -UnknownText_0x556ca: +GoldenrodPPSpeechHouseLassText: text "Sometimes, a" line "healthy #MON" @@ -71,5 +71,5 @@ GoldenrodPPSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x5564a, -1 - person_event SPRITE_LASS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x5564d, -1 + person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1 + person_event SPRITE_LASS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1 diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 289284ee5..ec4bb3f28 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -10,14 +10,14 @@ GoldenrodPokeComCenter2FMobile_MapScriptHeader: .MapCallbacks: db 0 -ScientistScript_0x625d1: - jumptextfaceplayer UnknownText_0x62674 +GoldenrodPokeComCenter2FMobileScientist1Script: + jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist1Text -ScientistScript_0x625d4: - jumptextfaceplayer UnknownText_0x626f9 +GoldenrodPokeComCenter2FMobileScientist2Script: + jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist2Text -ScientistScript_0x625d7: - jumptextfaceplayer UnknownText_0x62795 +GoldenrodPokeComCenter2FMobileScientist3Script: + jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist3Text MapGoldenrodPokeComCenter2FMobileSignpost0Script: opentext @@ -112,7 +112,7 @@ MenuDataHeader_0x6264c: MapGoldenrodPokeComCenter2FMobileSignpost2Script: jumptext UnknownText_0x62b26 -UnknownText_0x62674: +GoldenrodPokeComCenter2FMobileScientist1Text: text "#COM CENTER and" line "MOBILE CENTER were" @@ -126,7 +126,7 @@ UnknownText_0x62674: line "strangers." done -UnknownText_0x626f9: +GoldenrodPokeComCenter2FMobileScientist2Text: text "When you linked" line "with someone by" @@ -143,7 +143,7 @@ UnknownText_0x626f9: line "got the shakes!" done -UnknownText_0x62795: +GoldenrodPokeComCenter2FMobileScientist3Text: text "They were able to" line "build this huge" @@ -288,6 +288,6 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_SCIENTIST, 28, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d1, -1 - person_event SPRITE_SCIENTIST, 27, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d4, -1 - person_event SPRITE_SCIENTIST, 29, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d7, -1 + person_event SPRITE_SCIENTIST, 28, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist1Script, -1 + person_event SPRITE_SCIENTIST, 27, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist2Script, -1 + person_event SPRITE_SCIENTIST, 29, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist3Script, -1 diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index fc82c2549..e39832ab2 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -79,11 +79,11 @@ GoldenrodPokecenter1F_GSBallTriggerRight: .cancel end -GameboyKidScript_0x6101e: - jumptextfaceplayer UnknownText_0x62105 +GoldenrodPokecenter1FGameboyKidScript: + jumptextfaceplayer GoldenrodPokecenter1FGameboyKidText -LassScript_0x61021: - jumptextfaceplayer UnknownText_0x62260 +GoldenrodPokecenter1FLassScript: + jumptextfaceplayer GoldenrodPokecenter1FLassText PokefanFScript_0x61024: faceplayer @@ -663,7 +663,7 @@ UnknownText_0x620a1: cont "NEWS?" done -UnknownText_0x62105: +GoldenrodPokecenter1FGameboyKidText: text "The COLOSSEUM" line "upstairs is for" cont "link battles." @@ -701,7 +701,7 @@ UnknownText_0x62222: line "younger!" done -UnknownText_0x62260: +GoldenrodPokecenter1FLassText: text "A higher level" line "#MON doesn't" cont "always win." @@ -827,6 +827,6 @@ GoldenrodPokecenter1F_MapEventHeader: db 5 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x60f91, -1 person_event SPRITE_LINK_RECEPTIONIST, 8, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 - person_event SPRITE_GAMEBOY_KID, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x6101e, -1 - person_event SPRITE_LASS, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x61021, -1 + person_event SPRITE_GAMEBOY_KID, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1 + person_event SPRITE_LASS, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1 person_event SPRITE_POKEFAN_F, 5, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 95a8e8b66..5365e35d4 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -388,9 +388,9 @@ IlexForestHeadbuttGuyScript: end TrainerBug_catcherWayne: - trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, 0, Bug_catcherWayneScript + trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, 0, .Script -Bug_catcherWayneScript: +.Script: end_if_just_battled opentext writetext Bug_catcherWayneAfterBattleText diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 8105d6f32..b8d5b5481 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -9,19 +9,19 @@ IlexForestAzaleaGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x62c7a: - jumptextfaceplayer UnknownText_0x62c80 +IlexForestAzaleaGateOfficerScript: + jumptextfaceplayer IlexForestAzaleaGateOfficerText -GrannyScript_0x62c7d: - jumptextfaceplayer UnknownText_0x62cb0 +IlexForestAzaleaGateGrannyScript: + jumptextfaceplayer IlexForestAzaleaGateGrannyText -UnknownText_0x62c80: +IlexForestAzaleaGateOfficerText: text "ILEX FOREST is" line "big. Be careful!" cont "Don't get lost." done -UnknownText_0x62cb0: +IlexForestAzaleaGateGrannyText: text "The FOREST is" line "watched over by" cont "its protector." @@ -49,5 +49,5 @@ IlexForestAzaleaGate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x62c7a, -1 - person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrannyScript_0x62c7d, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1 + person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1 diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 080d319d6..5e3850a80 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -145,8 +145,8 @@ ClerkScript_0x18012f: closetext end -CooltrainerMScript_0x180136: - jumptextfaceplayer UnknownText_0x180178 +IndigoPlateauPokecenter1FCooltrainerMScript: + jumptextfaceplayer IndigoPlateauPokecenter1FCooltrainerMText TeleportGuyScript: faceplayer @@ -203,7 +203,7 @@ PlateauRivalLeavesMovement: step DOWN step_end -UnknownText_0x180178: +IndigoPlateauPokecenter1FCooltrainerMText: text "At the #MON" line "LEAGUE, you'll get" @@ -325,7 +325,7 @@ IndigoPlateauPokecenter1F_MapEventHeader: db 6 person_event SPRITE_NURSE, 7, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18012c, -1 person_event SPRITE_CLERK, 7, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1 - person_event SPRITE_COOLTRAINER_M, 11, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x180136, -1 + person_event SPRITE_COOLTRAINER_M, 11, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1 person_event SPRITE_SILVER, 9, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL person_event SPRITE_GRAMPS, 9, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY person_event SPRITE_JYNX, 9, 0, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index c6d56a03b..426caacd4 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -121,11 +121,11 @@ UnknownScript_0x7009c: closetext end -SuperNerdScript_0x700a2: - jumptextfaceplayer UnknownText_0x70444 +LakeOfRageSuperNerdScript: + jumptextfaceplayer LakeOfRageSuperNerdText -CooltrainerFScript_0x700a5: - jumptextfaceplayer UnknownText_0x704bb +LakeOfRageCooltrainerFScript: + jumptextfaceplayer LakeOfRageCooltrainerFText MapLakeOfRageSignpost0Script: jumptext UnknownText_0x708d7 @@ -146,9 +146,9 @@ UnknownScript_0x700b8: end TrainerFisherAndre: - trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, FisherAndreScript + trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, .Script -FisherAndreScript: +.Script: end_if_just_battled opentext writetext FisherAndreAfterBattleText @@ -157,9 +157,9 @@ FisherAndreScript: end TrainerFisherRaymond: - trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, FisherRaymondScript + trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, .Script -FisherRaymondScript: +.Script: end_if_just_battled opentext writetext FisherRaymondAfterBattleText @@ -168,9 +168,9 @@ FisherRaymondScript: end TrainerCooltrainermAaron: - trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, CooltrainermAaronScript + trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, .Script -CooltrainermAaronScript: +.Script: end_if_just_battled opentext writetext CooltrainermAaronAfterBattleText @@ -179,9 +179,9 @@ CooltrainermAaronScript: end TrainerCooltrainerfLois: - trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, CooltrainerfLoisScript + trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, .Script -CooltrainerfLoisScript: +.Script: end_if_just_battled opentext writetext CooltrainerfLoisAfterBattleText @@ -336,7 +336,7 @@ UnknownText_0x70421: line "KARP are biting!" done -UnknownText_0x70444: +LakeOfRageSuperNerdText: text "I heard this lake" line "was made by ram-" cont "paging GYARADOS." @@ -348,7 +348,7 @@ UnknownText_0x70444: line "break now?" done -UnknownText_0x704bb: +LakeOfRageCooltrainerFText: text "Did my eyes de-" line "ceive me? I saw a" @@ -520,8 +520,8 @@ LakeOfRage_MapEventHeader: db 12 person_event SPRITE_LANCE, 28, 21, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE person_event SPRITE_GRAMPS, 26, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x7008e, -1 - person_event SPRITE_SUPER_NERD, 13, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x700a2, -1 - person_event SPRITE_COOLTRAINER_F, 29, 25, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x700a5, -1 + person_event SPRITE_SUPER_NERD, 13, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1 + person_event SPRITE_COOLTRAINER_F, 29, 25, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LakeOfRageCooltrainerFScript, -1 person_event SPRITE_FISHER, 23, 30, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS person_event SPRITE_FISHER, 26, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS person_event SPRITE_COOLTRAINER_M, 15, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 1ad1bd35e..29f1cfc91 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -12,14 +12,14 @@ LavRadioTower1F_MapScriptHeader: .MapCallbacks: db 0 -ReceptionistScript_0x7ee63: - jumptextfaceplayer UnknownText_0x7eebf +LavRadioTower1FReceptionistScript: + jumptextfaceplayer LavRadioTower1FReceptionistText -OfficerScript_0x7ee66: - jumptextfaceplayer UnknownText_0x7eefa +LavRadioTower1FOfficerScript: + jumptextfaceplayer LavRadioTower1FOfficerText -SuperNerdScript_0x7ee69: - jumptextfaceplayer UnknownText_0x7ef90 +LavRadioTower1FSuperNerdScript: + jumptextfaceplayer LavRadioTower1FSuperNerdText GentlemanScript_0x7ee6c: faceplayer @@ -77,7 +77,7 @@ MapLavRadioTower1FSignpost1Script: UnknownScript_0x7eebc: jumptext UnknownText_0x7f36b -UnknownText_0x7eebf: +LavRadioTower1FReceptionistText: text "Welcome!" line "Feel free to look" @@ -85,7 +85,7 @@ UnknownText_0x7eebf: line "this floor." done -UnknownText_0x7eefa: +LavRadioTower1FOfficerText: text "Sorry, but you can" line "only tour the" cont "ground floor." @@ -100,7 +100,7 @@ UnknownText_0x7eefa: line "up our security." done -UnknownText_0x7ef90: +LavRadioTower1FSuperNerdText: text "Many people are" line "hard at work here" @@ -240,8 +240,8 @@ LavRadioTower1F_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_RECEPTIONIST, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x7ee63, -1 - person_event SPRITE_OFFICER, 1, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7ee66, -1 - person_event SPRITE_SUPER_NERD, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7ee69, -1 + person_event SPRITE_RECEPTIONIST, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1 + person_event SPRITE_OFFICER, 1, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1 + person_event SPRITE_SUPER_NERD, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1 person_event SPRITE_GENTLEMAN, 1, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1 person_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 499e1187e..ba43dc2df 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -16,13 +16,13 @@ ClerkScript_0x7eb1c: closetext end -PokefanMScript_0x7eb23: - jumptextfaceplayer UnknownText_0x7eb29 +LavenderMartPokefanMScript: + jumptextfaceplayer LavenderMartPokefanMText -RockerScript_0x7eb26: - jumptextfaceplayer UnknownText_0x7ebac +LavenderMartRockerScript: + jumptextfaceplayer LavenderMartRockerText -UnknownText_0x7eb29: +LavenderMartPokefanMText: text "REPEL is a neces-" line "sity if you are" @@ -36,7 +36,7 @@ UnknownText_0x7eb29: line "all the caves." done -UnknownText_0x7ebac: +LavenderMartRockerText: text "I heard about a" line "craftsman who" @@ -65,5 +65,5 @@ LavenderMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1 - person_event SPRITE_POKEFAN_M, 6, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x7eb23, -1 - person_event SPRITE_ROCKER, 2, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RockerScript_0x7eb26, -1 + person_event SPRITE_POKEFAN_M, 6, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1 + person_event SPRITE_ROCKER, 2, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LavenderMartRockerScript, -1 diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index c961364d5..5b740df4a 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -14,11 +14,11 @@ LavenderPokecenter1F_MapScriptHeader: NurseScript_0x7e6a0: jumpstd pokecenternurse -GentlemanScript_0x7e6a3: - jumptextfaceplayer UnknownText_0x7e6bd +LavenderPokecenter1FGentlemanScript: + jumptextfaceplayer LavenderPokecenter1FGentlemanText -TeacherScript_0x7e6a6: - jumptextfaceplayer UnknownText_0x7e710 +LavenderPokecenter1FTeacherScript: + jumptextfaceplayer LavenderPokecenter1FTeacherText YoungsterScript_0x7e6a9: faceplayer @@ -36,7 +36,7 @@ UnknownScript_0x7e6b7: closetext end -UnknownText_0x7e6bd: +LavenderPokecenter1FGentlemanText: text "To the north of" line "LAVENDER is ROCK" @@ -45,7 +45,7 @@ UnknownText_0x7e6bd: cont "POWER PLANT." done -UnknownText_0x7e710: +LavenderPokecenter1FTeacherText: text "There's a radio" line "program that plays" cont "# FLUTE music." @@ -99,6 +99,6 @@ LavenderPokecenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1 - person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x7e6a3, -1 - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7e6a6, -1 + person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1 + person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1 person_event SPRITE_YOUNGSTER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 65bb780f2..9ed0c9c5a 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -16,17 +16,17 @@ LavenderTown_MapScriptHeader: setflag ENGINE_FLYPOINT_LAVENDER return -PokefanMScript_0x1ad6e4: - jumptextfaceplayer UnknownText_0x1ad702 +LavenderTownPokefanMScript: + jumptextfaceplayer LavenderTownPokefanMText -TeacherScript_0x1ad6e7: - jumptextfaceplayer UnknownText_0x1ad73a +LavenderTownTeacherScript: + jumptextfaceplayer LavenderTownTeacherText -GrampsScript_0x1ad6ea: - jumptextfaceplayer UnknownText_0x1ad75c +LavenderTownGrampsScript: + jumptextfaceplayer LavenderTownGrampsText -YoungsterScript_0x1ad6ed: - jumptextfaceplayer UnknownText_0x1ad7ac +LavenderTownYoungsterScript: + jumptextfaceplayer LavenderTownYoungsterText LavenderTownSign: jumptext LavenderTownSignText @@ -46,7 +46,7 @@ LavenderPokecenterSignText: LavenderMartSignText: jumpstd martsign -UnknownText_0x1ad702: +LavenderTownPokefanMText: text "That's quite some" line "building, eh?" @@ -54,12 +54,12 @@ UnknownText_0x1ad702: line "TOWER." done -UnknownText_0x1ad73a: +LavenderTownTeacherText: text "KANTO has many" line "good radio shows." done -UnknownText_0x1ad75c: +LavenderTownGrampsText: text "People come from" line "all over to pay" @@ -68,7 +68,7 @@ UnknownText_0x1ad75c: cont "of #MON." done -UnknownText_0x1ad7ac: +LavenderTownYoungsterText: text "You need a #" line "FLUTE to wake" cont "sleeping #MON." @@ -133,7 +133,7 @@ LavenderTown_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_POKEFAN_M, 7, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1ad6e4, -1 - person_event SPRITE_TEACHER, 15, 2, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1ad6e7, -1 - person_event SPRITE_GRAMPS, 12, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1ad6ea, -1 - person_event SPRITE_YOUNGSTER, 11, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 1, YoungsterScript_0x1ad6ed, -1 + person_event SPRITE_POKEFAN_M, 7, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1 + person_event SPRITE_TEACHER, 15, 2, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1 + person_event SPRITE_GRAMPS, 12, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LavenderTownGrampsScript, -1 + person_event SPRITE_YOUNGSTER, 11, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1 diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index 7ba3064e2..d9432bcc5 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -8,13 +8,13 @@ LavenderTownSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -PokefanFScript_0x7ea47: - jumptextfaceplayer UnknownText_0x7ea4d +LavenderTownSpeechHousePokefanFScript: + jumptextfaceplayer LavenderTownSpeechHousePokefanFText LavenderTownSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x7ea4d: +LavenderTownSpeechHousePokefanFText: text "LAVENDER is a" line "tiny, quiet town" @@ -47,4 +47,4 @@ LavenderTownSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x7ea47, -1 + person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LavenderTownSpeechHousePokefanFScript, -1 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 67fb89372..acb68e46c 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -71,9 +71,9 @@ MahoganyGymTriggerRockets: jumpstd radiotowerrockets TrainerSkierRoxanne: - trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, SkierRoxanneScript + trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script -SkierRoxanneScript: +.Script: end_if_just_battled opentext writetext SkierRoxanneAfterBattleText @@ -82,9 +82,9 @@ SkierRoxanneScript: end TrainerSkierClarissa: - trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, SkierClarissaScript + trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, .Script -SkierClarissaScript: +.Script: end_if_just_battled opentext writetext SkierClarissaAfterBattleText @@ -93,9 +93,9 @@ SkierClarissaScript: end TrainerBoarderRonald: - trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, BoarderRonaldScript + trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, .Script -BoarderRonaldScript: +.Script: end_if_just_battled opentext writetext BoarderRonaldAfterBattleText @@ -104,9 +104,9 @@ BoarderRonaldScript: end TrainerBoarderBrad: - trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, BoarderBradScript + trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, .Script -BoarderBradScript: +.Script: end_if_just_battled opentext writetext BoarderBradAfterBattleText @@ -115,9 +115,9 @@ BoarderBradScript: end TrainerBoarderDouglas: - trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, BoarderDouglasScript + trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, .Script -BoarderDouglasScript: +.Script: end_if_just_battled opentext writetext BoarderDouglasAfterBattleText diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index 73c978836..7c98250f4 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -14,16 +14,16 @@ MahoganyPokecenter1F_MapScriptHeader: NurseScript_0x19a356: jumpstd pokecenternurse -PokefanMScript_0x19a359: - jumptextfaceplayer UnknownText_0x19a362 +MahoganyPokecenter1FPokefanMScript: + jumptextfaceplayer MahoganyPokecenter1FPokefanMText -YoungsterScript_0x19a35c: - jumptextfaceplayer UnknownText_0x19a3b3 +MahoganyPokecenter1FYoungsterScript: + jumptextfaceplayer MahoganyPokecenter1FYoungsterText -CooltrainerFScript_0x19a35f: - jumptextfaceplayer UnknownText_0x19a418 +MahoganyPokecenter1FCooltrainerFScript: + jumptextfaceplayer MahoganyPokecenter1FCooltrainerFText -UnknownText_0x19a362: +MahoganyPokecenter1FPokefanMText: text "What's this? TEAM" line "ROCKET has come" cont "back?" @@ -33,7 +33,7 @@ UnknownText_0x19a362: cont "RAGE…" done -UnknownText_0x19a3b3: +MahoganyPokecenter1FYoungsterText: text "I stop my #MON" line "from evolving too" cont "early." @@ -44,7 +44,7 @@ UnknownText_0x19a3b3: cont "evolve." done -UnknownText_0x19a418: +MahoganyPokecenter1FCooltrainerFText: text "#MON do become" line "stronger when they" @@ -72,6 +72,6 @@ MahoganyPokecenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x19a356, -1 - person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x19a359, -1 - person_event SPRITE_YOUNGSTER, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19a35c, -1 - person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x19a35f, -1 + person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1 + person_event SPRITE_YOUNGSTER, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1 + person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index c03e07361..0361f5195 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -9,8 +9,8 @@ MahoganyRedGyaradosSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -BlackBeltScript_0x19997f: - jumptextfaceplayer UnknownText_0x19999c +MahoganyRedGyaradosSpeechHouseBlackBeltScript: + jumptextfaceplayer MahoganyRedGyaradosSpeechHouseBlackBeltText TeacherScript_0x199982: faceplayer @@ -34,7 +34,7 @@ UnknownScript_0x195996: UnknownScript_0x195999: jumpstd magazinebookshelf -UnknownText_0x19999c: +MahoganyRedGyaradosSpeechHouseBlackBeltText: text "I heard that a red" line "GYARADOS appeared" cont "at the LAKE." @@ -77,5 +77,5 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x19997f, -1 + person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1 person_event SPRITE_TEACHER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x199982, -1 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 5439e065c..9655b7073 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -103,11 +103,11 @@ UnknownScript_0x19008c: closetext end -FisherScript_0x190092: - jumptextfaceplayer UnknownText_0x190276 +MahoganyTownFisherScript: + jumptextfaceplayer MahoganyTownFisherText -LassScript_0x190095: - jumptextfaceplayer UnknownText_0x1902f2 +MahoganyTownLassScript: + jumptextfaceplayer MahoganyTownLassText MahoganyTownSign: jumptext MahoganyTownSignText @@ -200,7 +200,7 @@ UnknownText_0x19021d: cont "anglers there." done -UnknownText_0x190276: +MahoganyTownFisherText: text "Since you came" line "this far, take the" @@ -214,7 +214,7 @@ UnknownText_0x190276: line "right now." done -UnknownText_0x1902f2: +MahoganyTownLassText: text "Visit Grandma's" line "shop. She sells" @@ -272,5 +272,5 @@ MahoganyTown_MapEventHeader: db 4 person_event SPRITE_POKEFAN_M, 8, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST person_event SPRITE_GRAMPS, 9, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1 - person_event SPRITE_FISHER, 14, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x190092, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM - person_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x190095, EVENT_MAHOGANY_MART_OWNERS + person_event SPRITE_FISHER, 14, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM + person_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index aa0b97167..8dfe26579 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -18,10 +18,10 @@ GrampsScript_0x771a8: closetext end -LassScript_0x771b0: - jumptextfaceplayer UnknownText_0x771b3 +MountMoonGiftShopLassScript: + jumptextfaceplayer MountMoonGiftShopLassText -UnknownText_0x771b3: +MountMoonGiftShopLassText: text "When the sun goes" line "down, CLEFAIRY" cont "come out to play." @@ -46,5 +46,5 @@ MountMoonGiftShop_MapEventHeader: db 4 person_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 - person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, MORN, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1 - person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, DAY, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1 + person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, MORN, 0, PERSONTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 + person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, DAY, 0, PERSONTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index d5c1fdf10..4708b7c60 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -18,9 +18,9 @@ MountMortar1FInside_MapScriptHeader: db 0 TrainerPokemaniacMiller: - trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, PokemaniacMillerScript + trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script -PokemaniacMillerScript: +.Script: end_if_just_battled opentext writetext PokemaniacMillerAfterBattleText @@ -29,9 +29,9 @@ PokemaniacMillerScript: end TrainerSupernerdMarkus: - trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, SupernerdMarkusScript + trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, .Script -SupernerdMarkusScript: +.Script: end_if_just_battled opentext writetext SupernerdMarkusAfterBattleText diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 2c57b863a..a78d8453e 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -15,9 +15,9 @@ MountMortar2FInside_MapScriptHeader: db 0 TrainerSupernerdHugh: - trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, SupernerdHughScript + trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script -SupernerdHughScript: +.Script: end_if_just_battled opentext writetext SupernerdHughAfterBattleText diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index a439b7b54..35b7dbcf8 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -12,11 +12,11 @@ MrFujisHouse_MapScriptHeader: .MapCallbacks: db 0 -SuperNerdScript_0x7e8ca: - jumptextfaceplayer UnknownText_0x7e8f1 +MrFujisHouseSuperNerdScript: + jumptextfaceplayer MrFujisHouseSuperNerdText -LassScript_0x7e8cd: - jumptextfaceplayer UnknownText_0x7e940 +MrFujisHouseLassScript: + jumptextfaceplayer MrFujisHouseLassText MrFujisPsyduck: opentext @@ -45,7 +45,7 @@ MrFujisPidgey: MrFujisHouseBookshelf: jumpstd difficultbookshelf -UnknownText_0x7e8f1: +MrFujisHouseSuperNerdText: text "MR.FUJI does live" line "here, but he's not" @@ -55,7 +55,7 @@ UnknownText_0x7e8f1: line "the SOUL HOUSE." done -UnknownText_0x7e940: +MrFujisHouseLassText: text "Some cold-hearted" line "people stop caring" cont "for their #MON." @@ -98,8 +98,8 @@ MrFujisHouse_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_SUPER_NERD, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7e8ca, -1 - person_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x7e8cd, -1 + person_event SPRITE_SUPER_NERD, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1 + person_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1 person_event SPRITE_RHYDON, 4, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MrFujisPsyduck, -1 person_event SPRITE_GROWLITHE, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, MrFujisNidorino, -1 person_event SPRITE_MOLTRES, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, MrFujisPidgey, -1 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 6298f3e34..e0a228bb2 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -21,11 +21,11 @@ NationalPark_MapScriptHeader: .MapCallbacks: db 0 -LassScript_0x5c002: - jumptextfaceplayer UnknownText_0x5c1d3 +NationalParkLassScript: + jumptextfaceplayer NationalParkLassText -PokefanFScript_0x5c005: - jumptextfaceplayer UnknownText_0x5c22e +NationalParkPokefanFScript: + jumptextfaceplayer NationalParkPokefanFText TeacherScript_0x5c008: faceplayer @@ -44,14 +44,14 @@ UnknownScript_0x5c021: closetext end -YoungsterScript_0x5c023: - jumptextfaceplayer UnknownText_0x5c35d +NationalParkYoungster1Script: + jumptextfaceplayer NationalParkYoungster1Text -YoungsterScript_0x5c026: - jumptextfaceplayer UnknownText_0x5c38f +NationalParkYoungster2Script: + jumptextfaceplayer NationalParkYoungster2Text -TeacherScript_0x5c029: - jumptextfaceplayer UnknownText_0x5c3bc +NationalParkTeacherScript: + jumptextfaceplayer NationalParkTeacherText NationalParkPersian: faceplayer @@ -72,9 +72,9 @@ GameboyKidScript_0x5c037: end TrainerSchoolboyJack1: - trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, SchoolboyJack1Script + trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, .Script -SchoolboyJack1Script: +.Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK end_if_just_battled opentext @@ -189,9 +189,9 @@ UnknownScript_0x5c114: end TrainerPokefanmWilliam: - trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, PokefanmWilliamScript + trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, .Script -PokefanmWilliamScript: +.Script: end_if_just_battled opentext writetext PokefanmWilliamAfterBattleText @@ -200,9 +200,9 @@ PokefanmWilliamScript: end TrainerPokefanfBeverly1: - trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, PokefanfBeverly1Script + trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, .Script -PokefanfBeverly1Script: +.Script: writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY end_if_just_battled opentext @@ -279,9 +279,9 @@ UnknownScript_0x5c1ab: end TrainerLassKrise: - trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, LassKriseScript + trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, .Script -LassKriseScript: +.Script: end_if_just_battled opentext writetext LassKriseAfterBattleText @@ -308,7 +308,7 @@ NationalParkHiddenFullHeal: dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL -UnknownText_0x5c1d3: +NationalParkLassText: text "Look! Check out my" line "bag!" @@ -319,7 +319,7 @@ UnknownText_0x5c1d3: line "them on my bag." done -UnknownText_0x5c22e: +NationalParkPokefanFText: text "This is MAIL I got" line "from my daughter." cont "It cheers me up." @@ -354,19 +354,19 @@ UnknownText_0x5c30d: cont "during battle." done -UnknownText_0x5c35d: +NationalParkYoungster1Text: text "I'm playing with" line "stickers I printed" cont "from my #DEX." done -UnknownText_0x5c38f: +NationalParkYoungster2Text: text "I get the other" line "guy's #DEX" cont "sticker if I win." done -UnknownText_0x5c3bc: +NationalParkTeacherText: text "I take walks in" line "the PARK, but I" @@ -537,12 +537,12 @@ NationalPark_MapEventHeader: .PersonEvents: db 14 - person_event SPRITE_LASS, 24, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x5c002, -1 - person_event SPRITE_POKEFAN_F, 4, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x5c005, -1 + person_event SPRITE_LASS, 24, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, NationalParkLassScript, -1 + person_event SPRITE_POKEFAN_F, 4, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1 person_event SPRITE_TEACHER, 40, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1 - person_event SPRITE_YOUNGSTER, 41, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c023, -1 - person_event SPRITE_YOUNGSTER, 41, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c026, -1 - person_event SPRITE_TEACHER, 41, 17, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5c029, -1 + person_event SPRITE_YOUNGSTER, 41, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NationalParkYoungster1Script, -1 + person_event SPRITE_YOUNGSTER, 41, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, NationalParkYoungster2Script, -1 + person_event SPRITE_TEACHER, 41, 17, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NationalParkTeacherScript, -1 person_event SPRITE_GROWLITHE, 40, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NationalParkPersian, -1 person_event SPRITE_YOUNGSTER, 23, 27, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1 person_event SPRITE_POKEFAN_F, 29, 18, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 9cf4e67f6..01216d0bb 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -25,11 +25,11 @@ UnknownScript_0x9c8d3: closetext end -FishingGuruScript_0x9c8d9: - jumptextfaceplayer UnknownText_0x9c9c5 +OlivineCafeFishingGuruScript: + jumptextfaceplayer OlivineCafeFishingGuruText -SailorScript_0x9c8dc: - jumptextfaceplayer UnknownText_0x9ca09 +OlivineCafeSailorScript: + jumptextfaceplayer OlivineCafeSailorText UnknownText_0x9c8df: text "Hah! Your #MON" @@ -56,7 +56,7 @@ UnknownText_0x9c965: line "buff bod!" done -UnknownText_0x9c9c5: +OlivineCafeFishingGuruText: text "OLIVINE CAFE's" line "menu is chock full" @@ -64,7 +64,7 @@ UnknownText_0x9c9c5: line "beefy SAILORS!" done -UnknownText_0x9ca09: +OlivineCafeSailorText: text "Whenever I roll" line "into this town, I" @@ -96,5 +96,5 @@ OlivineCafe_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_SAILOR, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1 - person_event SPRITE_FISHING_GURU, 3, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x9c8d9, -1 - person_event SPRITE_SAILOR, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x9c8dc, -1 + person_event SPRITE_FISHING_GURU, 3, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1 + person_event SPRITE_SAILOR, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 21b9943ec..e52dc54f6 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -72,8 +72,8 @@ UnknownScript_0x1a886b: special MapCallbackSprites_LoadUsedSpritesGFX end -SailorScript_0x1a88a3: - jumptextfaceplayer UnknownText_0x1a8a58 +OlivineCitySailor1Script: + jumptextfaceplayer OlivineCitySailor1Text StandingYoungsterScript_0x1a88a6: faceplayer @@ -91,8 +91,8 @@ UnknownScript_0x1a88b4: closetext end -SailorScript_0x1a88ba: - jumptextfaceplayer UnknownText_0x1a8b71 +OlivineCitySailor2Script: + jumptextfaceplayer OlivineCitySailor2Text OlivineCitySign: jumptext OlivineCitySignText @@ -207,7 +207,7 @@ UnknownText_0x1a88fa: cont "less weak!" done -UnknownText_0x1a8a58: +OlivineCitySailor1Text: text "Dark roads are" line "dangerous at" cont "night." @@ -240,7 +240,7 @@ UnknownText_0x1a8b41: line "awesome." done -UnknownText_0x1a8b71: +OlivineCitySailor2Text: text "The sea is sweet!" para "Sunsets on the sea" @@ -322,7 +322,7 @@ OlivineCity_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_SAILOR, 27, 26, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x1a88a3, -1 + person_event SPRITE_SAILOR, 27, 26, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineCitySailor1Script, -1 person_event SPRITE_STANDING_YOUNGSTER, 13, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1 - person_event SPRITE_SAILOR, 21, 17, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x1a88ba, -1 + person_event SPRITE_SAILOR, 21, 17, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineCitySailor2Script, -1 person_event SPRITE_OLIVINE_RIVAL, 11, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 06cffbe27..b3bc7e4d3 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -9,8 +9,8 @@ OlivineHouseBeta_MapScriptHeader: .MapCallbacks: db 0 -TeacherScript_0x9c58f: - jumptextfaceplayer UnknownText_0x9c5a2 +OlivineHouseBetaTeacherScript: + jumptextfaceplayer OlivineHouseBetaTeacherText RhydonScript_0x9c592: opentext @@ -26,7 +26,7 @@ OlivineHouseBetaBookshelf1: OlivineHouseBetaBookshelf2: jumpstd magazinebookshelf -UnknownText_0x9c5a2: +OlivineHouseBetaTeacherText: text "When my #MON" line "got sick, the" @@ -58,5 +58,5 @@ OlivineHouseBeta_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x9c58f, -1 + person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1 person_event SPRITE_RHYDON, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 422e86ad2..40dda9638 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -9,13 +9,13 @@ OlivineLighthouse1F_MapScriptHeader: .MapCallbacks: db 0 -SailorScript_0x5ae67: - jumptextfaceplayer UnknownText_0x5ae6d +OlivineLighthouse1FSailorScript: + jumptextfaceplayer OlivineLighthouse1FSailorText -PokefanFScript_0x5ae6a: - jumptextfaceplayer UnknownText_0x5aec2 +OlivineLighthouse1FPokefanFScript: + jumptextfaceplayer OlivineLighthouse1FPokefanFText -UnknownText_0x5ae6d: +OlivineLighthouse1FSailorText: text "People train at" line "this LIGHTHOUSE." @@ -24,7 +24,7 @@ UnknownText_0x5ae6d: cont "all the trainers." done -UnknownText_0x5aec2: +OlivineLighthouse1FPokefanFText: text "In the past, #-" line "MON used to light" @@ -56,5 +56,5 @@ OlivineLighthouse1F_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_SAILOR, 2, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x5ae67, -1 - person_event SPRITE_POKEFAN_F, 9, 16, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x5ae6a, -1 + person_event SPRITE_SAILOR, 2, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1 + person_event SPRITE_POKEFAN_F, 9, 16, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 24cafdc2c..d55515fe3 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -10,9 +10,9 @@ OlivineLighthouse2F_MapScriptHeader: db 0 TrainerGentlemanAlfred: - trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, GentlemanAlfredScript + trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script -GentlemanAlfredScript: +.Script: end_if_just_battled opentext writetext GentlemanAlfredAfterBattleText @@ -21,9 +21,9 @@ GentlemanAlfredScript: end TrainerSailorHuey1: - trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, 0, SailorHuey1Script + trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, 0, .Script -SailorHuey1Script: +.Script: writecode VAR_CALLERID, PHONE_SAILOR_HUEY end_if_just_battled opentext diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 7282c6e80..2b15d3487 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -12,9 +12,9 @@ OlivineLighthouse3F_MapScriptHeader: db 0 TrainerBird_keeperTheo: - trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, Bird_keeperTheoScript + trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, .Script -Bird_keeperTheoScript: +.Script: end_if_just_battled opentext writetext Bird_keeperTheoAfterBattleText @@ -23,9 +23,9 @@ Bird_keeperTheoScript: end TrainerGentlemanPreston: - trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, GentlemanPrestonScript + trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, .Script -GentlemanPrestonScript: +.Script: end_if_just_battled opentext writetext GentlemanPrestonAfterBattleText @@ -34,9 +34,9 @@ GentlemanPrestonScript: end TrainerSailorTerrell: - trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, SailorTerrellScript + trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, .Script -SailorTerrellScript: +.Script: end_if_just_battled opentext writetext SailorTerrellAfterBattleText diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index c1a3911e5..f9ff1d86c 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -10,9 +10,9 @@ OlivineLighthouse4F_MapScriptHeader: db 0 TrainerLassConnie: - trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, 0, LassConnie1Script + trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script -LassConnie1Script: +.Script: end_if_just_battled opentext writetext LassConnie1AfterBattleText @@ -21,9 +21,9 @@ LassConnie1Script: end TrainerSailorKent: - trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, 0, SailorKentScript + trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, 0, .Script -SailorKentScript: +.Script: end_if_just_battled opentext writetext SailorKentAfterBattleText diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 6dd14f384..08a9c4309 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -13,9 +13,9 @@ OlivineLighthouse5F_MapScriptHeader: db 0 TrainerBird_keeperDenis: - trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, 0, Bird_keeperDenisScript + trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, 0, .Script -Bird_keeperDenisScript: +.Script: end_if_just_battled opentext writetext Bird_keeperDenisAfterBattleText @@ -24,9 +24,9 @@ Bird_keeperDenisScript: end TrainerSailorErnest: - trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, SailorErnestScript + trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, .Script -SailorErnestScript: +.Script: end_if_just_battled opentext writetext SailorErnestAfterBattleText diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index d54546111..e18ce3f91 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -16,13 +16,13 @@ ClerkScript_0x9cac7: closetext end -CooltrainerFScript_0x9cace: - jumptextfaceplayer UnknownText_0x9cad4 +OlivineMartCooltrainerFScript: + jumptextfaceplayer OlivineMartCooltrainerFText -LassScript_0x9cad1: - jumptextfaceplayer UnknownText_0x9cb16 +OlivineMartLassScript: + jumptextfaceplayer OlivineMartLassText -UnknownText_0x9cad4: +OlivineMartCooltrainerFText: text "Do your #MON" line "already know the" @@ -30,7 +30,7 @@ UnknownText_0x9cad4: line "people on water?" done -UnknownText_0x9cb16: +OlivineMartLassText: text "My BUTTERFREE came" line "from my boyfriend" cont "overseas." @@ -63,5 +63,5 @@ OlivineMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9cace, -1 - person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x9cad1, -1 + person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1 + person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineMartLassScript, -1 diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index f331c95db..8454b786a 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -17,13 +17,13 @@ NurseScript_0x9c002: FishingGuruScript_0x9c005: jumpstd happinesschecknpc -FisherScript_0x9c008: - jumptextfaceplayer UnknownText_0x9c00e +OlivinePokecenter1FFisherScript: + jumptextfaceplayer OlivinePokecenter1FFisherText -TeacherScript_0x9c00b: - jumptextfaceplayer UnknownText_0x9c086 +OlivinePokecenter1FTeacherScript: + jumptextfaceplayer OlivinePokecenter1FTeacherText -UnknownText_0x9c00e: +OlivinePokecenter1FFisherText: text "The SAILOR in the" line "OLIVINE CAFE next" @@ -37,7 +37,7 @@ UnknownText_0x9c00e: line "big boulders." done -UnknownText_0x9c086: +OlivinePokecenter1FTeacherText: text "There's a person" line "in CIANWOOD CITY" cont "across the sea." @@ -67,5 +67,5 @@ OlivinePokecenter1F_MapEventHeader: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x9c002, -1 person_event SPRITE_FISHING_GURU, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1 - person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x9c008, -1 - person_event SPRITE_TEACHER, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x9c00b, -1 + person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1 + person_event SPRITE_TEACHER, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index f0137e294..60e5d4d04 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -194,8 +194,8 @@ UnknownScript_0x749f8: closetext end -SailorScript_0x749fe: - jumptextfaceplayer UnknownText_0x74cd7 +OlivinePortSailorScript: + jumptextfaceplayer OlivinePortSailorText FishingGuruScript_0x74a01: faceplayer @@ -377,7 +377,7 @@ UnknownText_0x74ca2: para "I wish I could go…" done -UnknownText_0x74cd7: +OlivinePortSailorText: text "We don't want you" line "to fall into the" @@ -405,7 +405,7 @@ OlivinePort_MapEventHeader: .PersonEvents: db 7 person_event SPRITE_SAILOR, 23, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY - person_event SPRITE_SAILOR, 15, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x749fe, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + person_event SPRITE_SAILOR, 15, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME person_event SPRITE_SAILOR, 15, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME person_event SPRITE_FISHING_GURU, 14, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME person_event SPRITE_FISHING_GURU, 14, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 116a05dfd..2f7a145bc 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -8,10 +8,10 @@ OlivinePortPassage_MapScriptHeader: .MapCallbacks: db 0 -PokefanMScript_0x76fac: - jumptextfaceplayer UnknownText_0x76faf +OlivinePortPassagePokefanMScript: + jumptextfaceplayer OlivinePortPassagePokefanMText -UnknownText_0x76faf: +OlivinePortPassagePokefanMText: text "FAST SHIP S.S.AQUA" line "sails to KANTO on" @@ -39,4 +39,4 @@ OlivinePortPassage_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKEFAN_M, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x76fac, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M + person_event SPRITE_POKEFAN_M, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 53dd04022..895e79e9c 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -14,11 +14,11 @@ PalletTown_MapScriptHeader: setflag ENGINE_FLYPOINT_PALLET return -TeacherScript_0x1ac6d5: - jumptextfaceplayer UnknownText_0x1ac6e7 +PalletTownTeacherScript: + jumptextfaceplayer PalletTownTeacherText -FisherScript_0x1ac6d8: - jumptextfaceplayer UnknownText_0x1ac720 +PalletTownFisherScript: + jumptextfaceplayer PalletTownFisherText PalletTownSign: jumptext PalletTownSignText @@ -32,7 +32,7 @@ OaksLabSign: BluesHouseSign: jumptext BluesHouseSignText -UnknownText_0x1ac6e7: +PalletTownTeacherText: text "I'm raising #-" line "MON too." @@ -40,7 +40,7 @@ UnknownText_0x1ac6e7: line "private guards." done -UnknownText_0x1ac720: +PalletTownFisherText: text "Technology is" line "incredible!" @@ -91,5 +91,5 @@ PalletTown_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_TEACHER, 8, 3, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1ac6d5, -1 - person_event SPRITE_FISHER, 14, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1ac6d8, -1 + person_event SPRITE_TEACHER, 8, 3, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PalletTownTeacherScript, -1 + person_event SPRITE_FISHER, 14, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PalletTownFisherScript, -1 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 9194cc4ec..6ea37bbf9 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -17,11 +17,11 @@ PewterCity_MapScriptHeader: setflag ENGINE_FLYPOINT_PEWTER return -CooltrainerFScript_0x18c009: - jumptextfaceplayer UnknownText_0x18c042 +PewterCityCooltrainerFScript: + jumptextfaceplayer PewterCityCooltrainerFText -BugCatcherScript_0x18c00c: - jumptextfaceplayer UnknownText_0x18c080 +PewterCityBugCatcherScript: + jumptextfaceplayer PewterCityBugCatcherText GrampsScript_0x18c00f: faceplayer @@ -68,7 +68,7 @@ FruitTreeScript_0x18c03e: FruitTreeScript_0x18c040: fruittree FRUITTREE_PEWTER_CITY_2 -UnknownText_0x18c042: +PewterCityCooltrainerFText: text "Have you visited" line "PEWTER GYM?" @@ -76,7 +76,7 @@ UnknownText_0x18c042: line "rock-type #MON." done -UnknownText_0x18c080: +PewterCityBugCatcherText: text "At night, CLEFAIRY" line "come out to play" cont "at MT.MOON." @@ -179,8 +179,8 @@ PewterCity_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_COOLTRAINER_F, 11, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18c009, -1 - person_event SPRITE_BUG_CATCHER, 29, 14, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x18c00c, -1 + person_event SPRITE_COOLTRAINER_F, 11, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1 + person_event SPRITE_BUG_CATCHER, 29, 14, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1 person_event SPRITE_GRAMPS, 17, 29, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1 person_event SPRITE_FRUIT_TREE, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1 person_event SPRITE_FRUIT_TREE, 3, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index d1549a7eb..8fe9b726d 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -41,9 +41,9 @@ BrockScript_0x1a2864: end TrainerCamperJerry: - trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, CamperJerryScript + trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, .Script -CamperJerryScript: +.Script: end_if_just_battled opentext writetext CamperJerryAfterBattleText diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index 553733889..9fb075ed9 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -16,13 +16,13 @@ ClerkScript_0x1a2dcb: closetext end -YoungsterScript_0x1a2dd2: - jumptextfaceplayer UnknownText_0x1a2dd8 +PewterMartYoungsterScript: + jumptextfaceplayer PewterMartYoungsterText -SuperNerdScript_0x1a2dd5: - jumptextfaceplayer UnknownText_0x1a2e3a +PewterMartSuperNerdScript: + jumptextfaceplayer PewterMartSuperNerdText -UnknownText_0x1a2dd8: +PewterMartYoungsterText: text "Hi! Check out my" line "GYARADOS!" @@ -33,7 +33,7 @@ UnknownText_0x1a2dd8: line "it has become." done -UnknownText_0x1a2e3a: +PewterMartSuperNerdText: text "There once was a" line "weird old man who" cont "sold MAGIKARP." @@ -63,5 +63,5 @@ PewterMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1 - person_event SPRITE_YOUNGSTER, 2, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a2dd2, -1 - person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a2dd5, -1 + person_event SPRITE_YOUNGSTER, 2, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1 + person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 394613336..07650d3e6 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -9,8 +9,8 @@ PewterNidoranSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -SuperNerdScript_0x1a2807: - jumptextfaceplayer UnknownText_0x1a2814 +PewterNidoranSpeechHouseSuperNerdScript: + jumptextfaceplayer PewterNidoranSpeechHouseSuperNerdText PewterNidoran: opentext @@ -20,7 +20,7 @@ PewterNidoran: closetext end -UnknownText_0x1a2814: +PewterNidoranSpeechHouseSuperNerdText: text "NIDORAN, shake!" done @@ -45,5 +45,5 @@ PewterNidoranSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_SUPER_NERD, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a2807, -1 + person_event SPRITE_SUPER_NERD, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1 person_event SPRITE_GROWLITHE, 5, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PewterNidoran, -1 diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index e9ddbbd32..2eb12d641 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -15,8 +15,8 @@ PewterPokecenter1F_MapScriptHeader: NurseScript_0x1a2ee7: jumpstd pokecenternurse -TeacherScript_0x1a2eea: - jumptextfaceplayer UnknownText_0x1a2f01 +PewterPokecenter1FTeacherScript: + jumptextfaceplayer PewterPokecenter1FTeacherText PewterJigglypuff: opentext @@ -26,8 +26,8 @@ PewterJigglypuff: closetext end -BugCatcherScript_0x1a2ef7: - jumptextfaceplayer UnknownText_0x1a2f75 +PewterPokecenter1FBugCatcherScript: + jumptextfaceplayer PewterPokecenter1FBugCatcherText Chris: faceplayer @@ -37,7 +37,7 @@ Chris: closetext end -UnknownText_0x1a2f01: +PewterPokecenter1FTeacherText: text "…Yeah, and the" line "GYM in CINNABAR's" @@ -53,7 +53,7 @@ PewterJigglypuffText: line "pupuu." done -UnknownText_0x1a2f75: +PewterPokecenter1FBugCatcherText: text "Most #MON get" line "drowsy if they" @@ -86,7 +86,7 @@ PewterPokecenter1F_MapEventHeader: .PersonEvents: db 5 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1 - person_event SPRITE_TEACHER, 6, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a2eea, -1 + person_event SPRITE_TEACHER, 6, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1 person_event SPRITE_JIGGLYPUFF, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PewterJigglypuff, -1 - person_event SPRITE_BUG_CATCHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x1a2ef7, -1 + person_event SPRITE_BUG_CATCHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1 person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Chris, -1 diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 49257b8c2..b8a83262b 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -8,13 +8,13 @@ PewterSnoozeSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -GrampsScript_0x1a3059: - jumptextfaceplayer UnknownText_0x1a305f +PewterSnoozeSpeechHouseGrampsScript: + jumptextfaceplayer PewterSnoozeSpeechHouseGrampsText PewterSnoozeSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x1a305f: +PewterSnoozeSpeechHouseGrampsText: text "I like snoozing" line "with the radio on…" cont "…Zzzz…" @@ -39,4 +39,4 @@ PewterSnoozeSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_GRAMPS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a3059, -1 + person_event SPRITE_GRAMPS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 72215ae42..08ed2ade9 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -49,8 +49,8 @@ UnknownScript_0x19181f: closetext end -ReceptionistScript_0x191821: - jumptextfaceplayer UnknownText_0x191b6d +PokemonFanClubReceptionistScript: + jumptextfaceplayer PokemonFanClubReceptionistText FisherScript_0x191824: faceplayer @@ -100,8 +100,8 @@ UnknownScript_0x191865: closetext end -TeacherScript_0x19186b: - jumptextfaceplayer UnknownText_0x191d73 +PokemonFanClubTeacherScript: + jumptextfaceplayer PokemonFanClubTeacherText ClefairyDoll: jumptext ClefairyDollText @@ -199,7 +199,7 @@ UnknownText_0x191b38: line "want to listen." done -UnknownText_0x191b6d: +PokemonFanClubReceptionistText: text "Our CHAIRMAN is" line "very vocal when it" cont "comes to #MON…" @@ -264,7 +264,7 @@ UnknownText_0x191d58: line "jammed full." done -UnknownText_0x191d73: +PokemonFanClubTeacherText: text "Look at my darling" line "BAYLEEF!" @@ -316,8 +316,8 @@ PokemonFanClub_MapEventHeader: .PersonEvents: db 6 person_event SPRITE_GENTLEMAN, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1 - person_event SPRITE_RECEPTIONIST, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x191821, -1 + person_event SPRITE_RECEPTIONIST, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1 person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x191824, -1 - person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x19186b, -1 + person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1 person_event SPRITE_FAIRY, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL person_event SPRITE_ODDISH, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FanClubBayleef, -1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 2e9524b9c..283663e69 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -179,16 +179,16 @@ UnknownScript_0x5ce4b: closetext end -LassScript_0x5ce51: - jumptextfaceplayer UnknownText_0x5d476 +RadioTower1FLassScript: + jumptextfaceplayer RadioTower1FLassText -YoungsterScript_0x5ce54: - jumptextfaceplayer UnknownText_0x5d4ac +RadioTower1FYoungsterScript: + jumptextfaceplayer RadioTower1FYoungsterText TrainerGruntM3: - trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, GruntM3Script + trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, .Script -GruntM3Script: +.Script: end_if_just_battled opentext writetext GruntM3AfterBattleText @@ -405,7 +405,7 @@ UnknownText_0x5d443: cont "change your mind." done -UnknownText_0x5d476: +RadioTower1FLassText: text "BEN is a fabulous" line "DJ." @@ -413,7 +413,7 @@ UnknownText_0x5d476: line "makes me melt!" done -UnknownText_0x5d4ac: +RadioTower1FYoungsterText: text "I love MARY, from" line "#MON TALK." @@ -493,8 +493,8 @@ RadioTower1F_MapEventHeader: .PersonEvents: db 6 person_event SPRITE_RECEPTIONIST, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1 - person_event SPRITE_LASS, 4, 16, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LassScript_0x5ce51, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_YOUNGSTER, 4, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5ce54, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_LASS, 4, 16, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_YOUNGSTER, 4, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_ROCKET, 1, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_COOLTRAINER_F, 6, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 0df11fdce..31093f073 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -21,8 +21,8 @@ RadioTower2F_MapScriptHeader: UnknownScript_0x5d6fd: end -SuperNerdScript_0x5d6fe: - jumptextfaceplayer UnknownText_0x5d924 +RadioTower2FSuperNerdScript: + jumptextfaceplayer RadioTower2FSuperNerdText TeacherScript_0x5d701: faceplayer @@ -48,16 +48,16 @@ RadioTowerJigglypuff: closetext end -BlackBeltScript_0x5d71f: - jumptextfaceplayer UnknownText_0x5d9cb +RadioTower2FBlackBelt1Script: + jumptextfaceplayer RadioTower2FBlackBelt1Text -BlackBeltScript_0x5d722: - jumptextfaceplayer UnknownText_0x5da44 +RadioTower2FBlackBelt2Script: + jumptextfaceplayer RadioTower2FBlackBelt2Text TrainerGruntM4: - trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, GruntM4Script + trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, .Script -GruntM4Script: +.Script: end_if_just_battled opentext writetext GruntM4AfterBattleText @@ -66,9 +66,9 @@ GruntM4Script: end TrainerGruntM5: - trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, GruntM5Script + trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, .Script -GruntM5Script: +.Script: end_if_just_battled opentext writetext GruntM5AfterBattleText @@ -77,9 +77,9 @@ GruntM5Script: end TrainerGruntM6: - trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, GruntM6Script + trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, .Script -GruntM6Script: +.Script: end_if_just_battled opentext writetext GruntM6AfterBattleText @@ -88,9 +88,9 @@ GruntM6Script: end TrainerGruntF2: - trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, GruntF2Script + trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, .Script -GruntF2Script: +.Script: end_if_just_battled opentext writetext GruntF2AfterBattleText @@ -343,7 +343,7 @@ MovementData_0x5d921: slow_step RIGHT step_end -UnknownText_0x5d924: +RadioTower2FSuperNerdText: text "You can listen to" line "the radio any-" cont "where. Tune in!" @@ -366,7 +366,7 @@ RadioTowerJigglypuffText: line "Jiggly…" done -UnknownText_0x5d9cb: +RadioTower2FBlackBelt1Text: text "Sorry. Authorized" line "personnel only" cont "beyond this point." @@ -379,7 +379,7 @@ UnknownText_0x5d9cb: cont "DIRECTOR…" done -UnknownText_0x5da44: +RadioTower2FBlackBelt2Text: text "Feel free to look" line "around anywhere." @@ -733,14 +733,14 @@ RadioTower2F_MapEventHeader: .PersonEvents: db 11 - person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x5d6fe, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_TEACHER, 2, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1 person_event SPRITE_ROCKET, 4, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 4, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET_GIRL, 5, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_BLACK_BELT, 1, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x5d71f, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS - person_event SPRITE_BLACK_BELT, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x5d722, EVENT_RADIO_TOWER_CIVILIANS_AFTER + person_event SPRITE_BLACK_BELT, 1, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS + person_event SPRITE_BLACK_BELT, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_JIGGLYPUFF, 1, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1 person_event SPRITE_BUENA, 5, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Buena, -1 person_event SPRITE_RECEPTIONIST, 7, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index ae2b1b1bf..ef15ce603 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -25,8 +25,8 @@ RadioTower3F_MapScriptHeader: changeblock $e, $4, $1 return -SuperNerdScript_0x5e553: - jumptextfaceplayer UnknownText_0x5e621 +RadioTower3FSuperNerdScript: + jumptextfaceplayer RadioTower3FSuperNerdText GymGuyScript_0x5e556: faceplayer @@ -83,9 +83,9 @@ UnknownScript_0x5e5a1: end TrainerGruntM7: - trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, GruntM7Script + trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, .Script -GruntM7Script: +.Script: end_if_just_battled opentext writetext GruntM7AfterBattleText @@ -94,9 +94,9 @@ GruntM7Script: end TrainerGruntM8: - trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, GruntM8Script + trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, .Script -GruntM8Script: +.Script: end_if_just_battled opentext writetext GruntM8AfterBattleText @@ -105,9 +105,9 @@ GruntM8Script: end TrainerGruntM9: - trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, GruntM9Script + trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, .Script -GruntM9Script: +.Script: end_if_just_battled opentext writetext GruntM9AfterBattleText @@ -116,9 +116,9 @@ GruntM9Script: end TrainerScientistMarc: - trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, ScientistMarcScript + trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, .Script -ScientistMarcScript: +.Script: end_if_just_battled opentext writetext ScientistMarcAfterBattleText @@ -156,7 +156,7 @@ MapRadioTower3FSignpost0Script: MapRadioTower3FSignpost1Script: jumptext UnknownText_0x5eae4 -UnknownText_0x5e621: +RadioTower3FSuperNerdText: text "We have recordings" line "of the cries of" @@ -349,7 +349,7 @@ RadioTower3F_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_SUPER_NERD, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x5e553, EVENT_RADIO_TOWER_CIVILIANS_AFTER + person_event SPRITE_SUPER_NERD, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1 person_event SPRITE_COOLTRAINER_F, 3, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1 person_event SPRITE_ROCKET, 1, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index f29ab1dac..38c802c85 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -14,8 +14,8 @@ RadioTower4F_MapScriptHeader: .MapCallbacks: db 0 -FisherScript_0x5eb82: - jumptextfaceplayer UnknownText_0x5ec12 +RadioTower4FFisherScript: + jumptextfaceplayer RadioTower4FFisherText TeacherScript_0x5eb85: faceplayer @@ -56,9 +56,9 @@ RadioTowerMeowth: end TrainerGruntM10: - trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, GruntM10Script + trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, .Script -GruntM10Script: +.Script: end_if_just_battled opentext writetext GruntM10AfterBattleText @@ -67,9 +67,9 @@ GruntM10Script: end TrainerExecutivem2: - trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, Executivem2Script + trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, .Script -Executivem2Script: +.Script: end_if_just_battled opentext writetext Executivem2AfterBattleText @@ -78,9 +78,9 @@ Executivem2Script: end TrainerGruntF4: - trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, GruntF4Script + trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, .Script -GruntF4Script: +.Script: end_if_just_battled opentext writetext GruntF4AfterBattleText @@ -89,9 +89,9 @@ GruntF4Script: end TrainerScientistRich: - trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, ScientistRichScript + trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, .Script -ScientistRichScript: +.Script: end_if_just_battled opentext writetext ScientistRichAfterBattleText @@ -105,7 +105,7 @@ MapRadioTower4FSignpost0Script: MapRadioTower4FSignpost1Script: jumptext UnknownText_0x5f00d -UnknownText_0x5ec12: +RadioTower4FFisherText: text "I listened to the" line "radio while I was" cont "at the RUINS." @@ -266,7 +266,7 @@ RadioTower4F_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_FISHER, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x5eb82, EVENT_RADIO_TOWER_CIVILIANS_AFTER + person_event SPRITE_FISHER, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_TEACHER, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1 person_event SPRITE_GROWLITHE, 7, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, RadioTowerMeowth, -1 person_event SPRITE_ROCKET, 6, 5, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index e8b70f7e1..020569db2 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -68,9 +68,9 @@ Director: end TrainerExecutivef1: - trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, Executivef1Script + trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, .Script -Executivef1Script: +.Script: end_if_just_battled opentext writetext Executivef1AfterBattleText diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index 5704cdcaf..5934f2cf4 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -5,13 +5,13 @@ RedsHouse2F_MapScriptHeader: .MapCallbacks: db 0 -MapRedsHouse2FSignpost0Script: - jumptext UnknownText_0x19b050 +RedsHouse2FN64Script: + jumptext RedsHouse2FN64Text -MapRedsHouse2FSignpost1Script: - jumptext UnknownText_0x19b087 +RedsHouse2FPCScript: + jumptext RedsHouse2FPCText -UnknownText_0x19b050: +RedsHouse2FN64Text: text " played the" line "N64." @@ -19,7 +19,7 @@ UnknownText_0x19b050: line "no time to lose!" done -UnknownText_0x19b087: +RedsHouse2FPCText: text "It looks like it" line "hasn't been used" cont "in a long time…" @@ -38,8 +38,8 @@ RedsHouse2F_MapEventHeader: .Signposts: db 2 - signpost 5, 3, SIGNPOST_READ, MapRedsHouse2FSignpost0Script - signpost 1, 0, SIGNPOST_READ, MapRedsHouse2FSignpost1Script + signpost 5, 3, SIGNPOST_READ, RedsHouse2FN64Script + signpost 1, 0, SIGNPOST_READ, RedsHouse2FPCScript .PersonEvents: db 0 diff --git a/maps/Route1.asm b/maps/Route1.asm index 3bda2934f..d083b2708 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -11,9 +11,9 @@ Route1_MapScriptHeader: db 0 TrainerSchoolboyDanny: - trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, SchoolboyDannyScript + trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script -SchoolboyDannyScript: +.Script: end_if_just_battled opentext writetext SchoolboyDannyAfterBattleText @@ -22,9 +22,9 @@ SchoolboyDannyScript: end TrainerCooltrainerfQuinn: - trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, CooltrainerfQuinnScript + trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, .Script -CooltrainerfQuinnScript: +.Script: end_if_just_battled opentext writetext CooltrainerfQuinnAfterBattleText diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index 18f1bd8ab..7fa695d0f 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -14,8 +14,8 @@ Route10Pokecenter1F_MapScriptHeader: NurseScript_0x188bd4: jumpstd pokecenternurse -GentlemanScript_0x188bd7: - jumptextfaceplayer UnknownText_0x188bf1 +Route10Pokecenter1FGentlemanScript: + jumptextfaceplayer Route10Pokecenter1FGentlemanText GymGuyScript_0x188bda: faceplayer @@ -33,10 +33,10 @@ UnknownScript_0x188be8: closetext end -CooltrainerFScript_0x188bee: - jumptextfaceplayer UnknownText_0x188d0c +Route10Pokecenter1FCooltrainerFScript: + jumptextfaceplayer Route10Pokecenter1FCooltrainerFText -UnknownText_0x188bf1: +Route10Pokecenter1FGentlemanText: text "A #MON CENTER" line "near a cave?" @@ -69,7 +69,7 @@ UnknownText_0x188c9e: line "thing about that." done -UnknownText_0x188d0c: +Route10Pokecenter1FCooltrainerFText: text "When you go out-" line "side, you can see" @@ -99,6 +99,6 @@ Route10Pokecenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1 - person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x188bd7, -1 + person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1 person_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1 - person_event SPRITE_COOLTRAINER_F, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x188bee, -1 + person_event SPRITE_COOLTRAINER_F, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index db5c7c5e9..2c9a6fd7f 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -10,9 +10,9 @@ Route10South_MapScriptHeader: db 0 TrainerHikerJim: - trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, HikerJimScript + trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script -HikerJimScript: +.Script: end_if_just_battled opentext writetext HikerJimAfterBattleText @@ -21,9 +21,9 @@ HikerJimScript: end TrainerPokefanmRobert: - trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, PokefanmRobertScript + trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, .Script -PokefanmRobertScript: +.Script: end_if_just_battled opentext writetext PokefanmRobertAfterBattleText diff --git a/maps/Route11.asm b/maps/Route11.asm index ca6159c38..c01fefdb8 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -13,9 +13,9 @@ Route11_MapScriptHeader: db 0 TrainerYoungsterOwen: - trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, YoungsterOwenScript + trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script -YoungsterOwenScript: +.Script: end_if_just_battled opentext writetext YoungsterOwenAfterBattleText @@ -24,9 +24,9 @@ YoungsterOwenScript: end TrainerYoungsterJason: - trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, YoungsterJasonScript + trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script -YoungsterJasonScript: +.Script: end_if_just_battled opentext writetext YoungsterJasonAfterBattleText @@ -35,9 +35,9 @@ YoungsterJasonScript: end TrainerPsychicHerman: - trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, PsychicHermanScript + trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script -PsychicHermanScript: +.Script: end_if_just_battled opentext writetext PsychicHermanAfterBattleText @@ -46,9 +46,9 @@ PsychicHermanScript: end TrainerPsychicFidel: - trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, PsychicFidelScript + trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script -PsychicFidelScript: +.Script: end_if_just_battled opentext writetext PsychicFidelAfterBattleText diff --git a/maps/Route12.asm b/maps/Route12.asm index 00c00f15f..ea867c641 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -14,9 +14,9 @@ Route12_MapScriptHeader: db 0 TrainerFisherKyle: - trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, FisherKyleScript + trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script -FisherKyleScript: +.Script: end_if_just_battled opentext writetext FisherKyleAfterBattleText @@ -25,9 +25,9 @@ FisherKyleScript: end TrainerFisherMartin: - trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, FisherMartinScript + trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, .Script -FisherMartinScript: +.Script: end_if_just_battled opentext writetext FisherMartinAfterBattleText @@ -36,9 +36,9 @@ FisherMartinScript: end TrainerFisherStephen: - trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, FisherStephenScript + trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, .Script -FisherStephenScript: +.Script: end_if_just_battled opentext writetext FisherStephenAfterBattleText @@ -47,9 +47,9 @@ FisherStephenScript: end TrainerFisherBarney: - trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, FisherBarneyScript + trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, .Script -FisherBarneyScript: +.Script: end_if_just_battled opentext writetext FisherBarneyAfterBattleText diff --git a/maps/Route13.asm b/maps/Route13.asm index baa220c44..03490891b 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -13,9 +13,9 @@ Route13_MapScriptHeader: db 0 TrainerPokefanmAlex: - trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, PokefanmAlexScript + trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script -PokefanmAlexScript: +.Script: end_if_just_battled opentext writetext PokefanmAlexAfterBattleText @@ -24,9 +24,9 @@ PokefanmAlexScript: end TrainerPokefanmJoshua: - trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, PokefanmJoshuaScript + trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, .Script -PokefanmJoshuaScript: +.Script: end_if_just_battled opentext writetext PokefanmJoshuaAfterBattleText @@ -35,9 +35,9 @@ PokefanmJoshuaScript: end TrainerBird_keeperPerry: - trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, 0, Bird_keeperPerryScript + trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, 0, .Script -Bird_keeperPerryScript: +.Script: end_if_just_battled opentext writetext Bird_keeperPerryAfterBattleText @@ -46,9 +46,9 @@ Bird_keeperPerryScript: end TrainerBird_keeperBret: - trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, 0, Bird_keeperBretScript + trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, 0, .Script -Bird_keeperBretScript: +.Script: end_if_just_battled opentext writetext Bird_keeperBretAfterBattleText @@ -57,9 +57,9 @@ Bird_keeperBretScript: end TrainerHikerKenny: - trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, HikerKennyScript + trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, .Script -HikerKennyScript: +.Script: end_if_just_battled opentext writetext HikerKennyAfterBattleText diff --git a/maps/Route14.asm b/maps/Route14.asm index 841ee2c97..e7a3c7f3f 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -20,9 +20,9 @@ Kim: end TrainerPokefanmCarter: - trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, PokefanmCarterScript + trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, .Script -PokefanmCarterScript: +.Script: end_if_just_battled opentext writetext PokefanmCarterAfterBattleText @@ -31,9 +31,9 @@ PokefanmCarterScript: end TrainerBird_keeperRoy: - trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, 0, Bird_keeperRoyScript + trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, 0, .Script -Bird_keeperRoyScript: +.Script: end_if_just_battled opentext writetext Bird_keeperRoyAfterBattleText @@ -42,9 +42,9 @@ Bird_keeperRoyScript: end TrainerPokefanmTrevor: - trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, PokefanmTrevorScript + trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, .Script -PokefanmTrevorScript: +.Script: end_if_just_battled opentext writetext PokefanmTrevorAfterBattleText diff --git a/maps/Route15.asm b/maps/Route15.asm index 3d78e29a2..317c536fb 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -15,9 +15,9 @@ Route15_MapScriptHeader: db 0 TrainerTeacherColette: - trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, TeacherColetteScript + trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script -TeacherColetteScript: +.Script: end_if_just_battled opentext writetext TeacherColetteAfterBattleText @@ -26,9 +26,9 @@ TeacherColetteScript: end TrainerTeacherHillary: - trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, TeacherHillaryScript + trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, .Script -TeacherHillaryScript: +.Script: end_if_just_battled opentext writetext TeacherHillaryAfterBattleText @@ -37,9 +37,9 @@ TeacherHillaryScript: end TrainerSchoolboyKipp: - trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, SchoolboyKippScript + trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, .Script -SchoolboyKippScript: +.Script: end_if_just_battled opentext writetext SchoolboyKippAfterBattleText @@ -48,9 +48,9 @@ SchoolboyKippScript: end TrainerSchoolboyTommy: - trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, SchoolboyTommyScript + trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, .Script -SchoolboyTommyScript: +.Script: end_if_just_battled opentext writetext SchoolboyTommyAfterBattleText @@ -59,9 +59,9 @@ SchoolboyTommyScript: end TrainerSchoolboyJohnny: - trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, SchoolboyJohnnyScript + trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, .Script -SchoolboyJohnnyScript: +.Script: end_if_just_battled opentext writetext SchoolboyJohnnyAfterBattleText @@ -70,9 +70,9 @@ SchoolboyJohnnyScript: end TrainerSchoolboyBilly: - trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, SchoolboyBillyScript + trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, .Script -SchoolboyBillyScript: +.Script: end_if_just_battled opentext writetext SchoolboyBillyAfterBattleText diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 920a07d97..855986895 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -8,10 +8,10 @@ Route15FuchsiaGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x19679e: - jumptextfaceplayer UnknownText_0x1967a1 +Route15FuchsiaGateOfficerScript: + jumptextfaceplayer Route15FuchsiaGateOfficerText -UnknownText_0x1967a1: +Route15FuchsiaGateOfficerText: text "You're working on" line "a #DEX? That's" @@ -38,4 +38,4 @@ Route15FuchsiaGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19679e, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 911cc1111..26f47f14a 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -8,13 +8,13 @@ Route16FuchsiaSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -SuperNerdScript_0x73373: - jumptextfaceplayer UnknownText_0x73379 +Route16FuchsiaSpeechHouseSuperNerdScript: + jumptextfaceplayer Route16FuchsiaSpeechHouseSuperNerdText Route16FuchsiaSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x73379: +Route16FuchsiaSpeechHouseSuperNerdText: text "If you cruise down" line "CYCLING ROAD, you" @@ -41,4 +41,4 @@ Route16FuchsiaSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x73373, -1 + person_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 3da6f3458..d8bfdc0d3 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -12,8 +12,8 @@ Route16Gate_MapScriptHeader: .DummyTrigger: end -OfficerScript_0x733ea: - jumptextfaceplayer UnknownText_0x73408 +Route16GateOfficerScript: + jumptextfaceplayer Route16GateOfficerText UnknownScript_0x733ed: checkitem BICYCLE @@ -35,7 +35,7 @@ MovementData_0x73405: turn_head LEFT step_end -UnknownText_0x73408: +Route16GateOfficerText: text "CYCLING ROAD" line "starts here." @@ -81,4 +81,4 @@ Route16Gate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x733ea, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route16GateOfficerScript, -1 diff --git a/maps/Route17.asm b/maps/Route17.asm index 03cfd3e4b..89043b890 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -18,9 +18,9 @@ Route17_MapScriptHeader: return TrainerBikerCharles: - trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, BikerCharlesScript + trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script -BikerCharlesScript: +.Script: end_if_just_battled opentext writetext BikerCharlesAfterBattleText @@ -29,9 +29,9 @@ BikerCharlesScript: end TrainerBikerRiley: - trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, BikerRileyScript + trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, .Script -BikerRileyScript: +.Script: end_if_just_battled opentext writetext BikerRileyAfterBattleText @@ -40,9 +40,9 @@ BikerRileyScript: end TrainerBikerJoel: - trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, BikerJoelScript + trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, .Script -BikerJoelScript: +.Script: end_if_just_battled opentext writetext BikerJoelAfterBattleText @@ -51,9 +51,9 @@ BikerJoelScript: end TrainerBikerGlenn: - trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, BikerGlennScript + trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, .Script -BikerGlennScript: +.Script: end_if_just_battled opentext writetext BikerGlennAfterBattleText diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index b93e7978f..c87d389aa 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -12,8 +12,8 @@ Route1718Gate_MapScriptHeader: .DummyTrigger: end -OfficerScript_0x7360e: - jumptextfaceplayer UnknownText_0x7362c +Route1718GateOfficerScript: + jumptextfaceplayer Route1718GateOfficerText UnknownScript_0x73611: checkitem BICYCLE @@ -35,7 +35,7 @@ MovementData_0x73629: turn_head LEFT step_end -UnknownText_0x7362c: +Route1718GateOfficerText: text "CYCLING ROAD" line "Uphill Starts Here" done @@ -72,4 +72,4 @@ Route1718Gate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7360e, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route1718GateOfficerScript, -1 diff --git a/maps/Route18.asm b/maps/Route18.asm index 8c02559f4..16f5c6920 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -10,9 +10,9 @@ Route18_MapScriptHeader: db 0 TrainerBird_keeperBoris: - trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, 0, Bird_keeperBorisScript + trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, 0, .Script -Bird_keeperBorisScript: +.Script: end_if_just_battled opentext writetext Bird_keeperBorisAfterBattleText @@ -21,9 +21,9 @@ Bird_keeperBorisScript: end TrainerBird_keeperBob: - trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, 0, Bird_keeperBobScript + trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, 0, .Script -Bird_keeperBobScript: +.Script: end_if_just_battled opentext writetext Bird_keeperBobAfterBattleText diff --git a/maps/Route19.asm b/maps/Route19.asm index 18bffe3e4..02e59165f 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -27,9 +27,9 @@ Route19_MapScriptHeader: return TrainerSwimmerfDawn: - trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, SwimmerfDawnScript + trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script -SwimmerfDawnScript: +.Script: end_if_just_battled opentext writetext SwimmerfDawnAfterBattleText @@ -38,9 +38,9 @@ SwimmerfDawnScript: end TrainerSwimmermHarold: - trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, SwimmermHaroldScript + trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, .Script -SwimmermHaroldScript: +.Script: end_if_just_battled opentext writetext SwimmermHaroldAfterBattleText @@ -49,9 +49,9 @@ SwimmermHaroldScript: end TrainerSwimmermJerome: - trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, SwimmermJeromeScript + trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, .Script -SwimmermJeromeScript: +.Script: end_if_just_battled opentext writetext SwimmermJeromeAfterBattleText @@ -60,9 +60,9 @@ SwimmermJeromeScript: end TrainerSwimmermTucker: - trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, SwimmermTuckerScript + trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, .Script -SwimmermTuckerScript: +.Script: end_if_just_battled opentext writetext SwimmermTuckerAfterBattleText diff --git a/maps/Route2.asm b/maps/Route2.asm index be4069932..d33381b26 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -16,9 +16,9 @@ Route2_MapScriptHeader: db 0 TrainerBug_catcherRob: - trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, 0, Bug_catcherRobScript + trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, 0, .Script -Bug_catcherRobScript: +.Script: end_if_just_battled opentext writetext Bug_catcherRobAfterBattleText @@ -27,9 +27,9 @@ Bug_catcherRobScript: end TrainerBug_catcherEd: - trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, 0, Bug_catcherEdScript + trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, 0, .Script -Bug_catcherEdScript: +.Script: end_if_just_battled opentext writetext Bug_catcherEdAfterBattleText @@ -38,9 +38,9 @@ Bug_catcherEdScript: end TrainerBug_catcherDoug: - trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, 0, Bug_catcherDougScript + trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, 0, .Script -Bug_catcherDougScript: +.Script: end_if_just_battled opentext writetext Bug_catcherDougAfterBattleText diff --git a/maps/Route20.asm b/maps/Route20.asm index c849e516c..c0a05f7a4 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -16,9 +16,9 @@ Route20_MapScriptHeader: return TrainerSwimmerfNicole: - trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, SwimmerfNicoleScript + trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script -SwimmerfNicoleScript: +.Script: end_if_just_battled opentext writetext SwimmerfNicoleAfterBattleText @@ -27,9 +27,9 @@ SwimmerfNicoleScript: end TrainerSwimmerfLori: - trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, SwimmerfLoriScript + trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, .Script -SwimmerfLoriScript: +.Script: end_if_just_battled opentext writetext SwimmerfLoriAfterBattleText @@ -38,9 +38,9 @@ SwimmerfLoriScript: end TrainerSwimmermCameron: - trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, SwimmermCameronScript + trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, .Script -SwimmermCameronScript: +.Script: end_if_just_battled opentext writetext SwimmermCameronAfterBattleText diff --git a/maps/Route21.asm b/maps/Route21.asm index 28b17d11d..64bc65257 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -11,9 +11,9 @@ Route21_MapScriptHeader: db 0 TrainerSwimmermSeth: - trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, SwimmermSethScript + trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script -SwimmermSethScript: +.Script: end_if_just_battled opentext writetext SwimmermSethAfterBattleText @@ -22,9 +22,9 @@ SwimmermSethScript: end TrainerSwimmerfNikki: - trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, SwimmerfNikkiScript + trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, .Script -SwimmerfNikkiScript: +.Script: end_if_just_battled opentext writetext SwimmerfNikkiAfterBattleText @@ -33,9 +33,9 @@ SwimmerfNikkiScript: end TrainerFisherArnold: - trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, FisherArnoldScript + trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, .Script -FisherArnoldScript: +.Script: end_if_just_battled opentext writetext FisherArnoldAfterBattleText diff --git a/maps/Route25.asm b/maps/Route25.asm index 76b43b70f..44e854532 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -79,9 +79,9 @@ UnknownScript_0x19eee0: end TrainerSchoolboyDudley: - trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, SchoolboyDudleyScript + trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script -SchoolboyDudleyScript: +.Script: end_if_just_battled opentext writetext SchoolboyDudleyAfterBattleText @@ -90,9 +90,9 @@ SchoolboyDudleyScript: end TrainerLassEllen: - trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, LassEllenScript + trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script -LassEllenScript: +.Script: end_if_just_battled opentext writetext LassEllenAfterBattleText @@ -101,9 +101,9 @@ LassEllenScript: end TrainerSchoolboyJoe: - trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, SchoolboyJoeScript + trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script -SchoolboyJoeScript: +.Script: end_if_just_battled opentext writetext SchoolboyJoeAfterBattleText @@ -112,9 +112,9 @@ SchoolboyJoeScript: end TrainerLassLaura: - trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, LassLauraScript + trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script -LassLauraScript: +.Script: end_if_just_battled opentext writetext LassLauraAfterBattleText @@ -123,9 +123,9 @@ LassLauraScript: end TrainerCamperLloyd: - trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, CamperLloydScript + trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script -CamperLloydScript: +.Script: end_if_just_battled opentext writetext CamperLloydAfterBattleText @@ -134,9 +134,9 @@ CamperLloydScript: end TrainerLassShannon: - trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, LassShannonScript + trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script -LassShannonScript: +.Script: end_if_just_battled opentext writetext LassShannonAfterBattleText @@ -145,9 +145,9 @@ LassShannonScript: end TrainerSupernerdPat: - trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, SupernerdPatScript + trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script -SupernerdPatScript: +.Script: end_if_just_battled opentext writetext SupernerdPatAfterBattleText diff --git a/maps/Route26.asm b/maps/Route26.asm index 589ed25d0..f48f2b082 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -16,9 +16,9 @@ Route26_MapScriptHeader: db 0 TrainerCooltrainermJake: - trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, CooltrainermJakeScript + trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script -CooltrainermJakeScript: +.Script: end_if_just_battled opentext writetext CooltrainermJakeAfterBattleText @@ -27,9 +27,9 @@ CooltrainermJakeScript: end TrainerCooltrainermGaven3: - trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, CooltrainermGaven3Script + trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, .Script -CooltrainermGaven3Script: +.Script: writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN end_if_just_battled opentext @@ -120,9 +120,9 @@ UnknownScript_0x1a4dd7: end TrainerCooltrainerfJoyce: - trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, CooltrainerfJoyceScript + trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, .Script -CooltrainerfJoyceScript: +.Script: end_if_just_battled opentext writetext CooltrainerfJoyceAfterBattleText @@ -131,9 +131,9 @@ CooltrainerfJoyceScript: end TrainerCooltrainerfBeth1: - trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, CooltrainerfBeth1Script + trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, .Script -CooltrainerfBeth1Script: +.Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH end_if_just_battled opentext @@ -224,9 +224,9 @@ UnknownScript_0x1a4e93: end TrainerPsychicRichard: - trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, PsychicRichardScript + trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, .Script -PsychicRichardScript: +.Script: end_if_just_battled opentext writetext PsychicRichardAfterBattleText @@ -235,9 +235,9 @@ PsychicRichardScript: end TrainerFisherScott: - trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, FisherScottScript + trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, .Script -FisherScottScript: +.Script: end_if_just_battled opentext writetext FisherScottAfterBattleText diff --git a/maps/Route27.asm b/maps/Route27.asm index 9af0531cf..10716d9fb 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -39,19 +39,19 @@ UnknownScript_0x1a088c: opentext writetext UnknownText_0x1a0a6b buttonsound - writetext UnknownText_0x1a0a71 + writetext Route27FisherText waitbutton closetext dotrigger $1 end -FisherScript_0x1a089c: - jumptextfaceplayer UnknownText_0x1a0a71 +Route27FisherScript: + jumptextfaceplayer Route27FisherText TrainerPsychicGilbert: - trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, PsychicGilbertScript + trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, .Script -PsychicGilbertScript: +.Script: end_if_just_battled opentext writetext PsychicGilbertAfterBattleText @@ -60,9 +60,9 @@ PsychicGilbertScript: end TrainerBird_keeperJose2: - trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, 0, Bird_keeperJose2Script + trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, 0, .Script -Bird_keeperJose2Script: +.Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE end_if_just_battled opentext @@ -173,9 +173,9 @@ UnknownScript_0x1a0977: end TrainerCooltrainermBlake: - trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, CooltrainermBlakeScript + trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, .Script -CooltrainermBlakeScript: +.Script: end_if_just_battled opentext writetext CooltrainermBlakeAfterBattleText @@ -184,9 +184,9 @@ CooltrainermBlakeScript: end TrainerCooltrainermBrian: - trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, CooltrainermBrianScript + trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, .Script -CooltrainermBrianScript: +.Script: end_if_just_battled opentext writetext CooltrainermBrianAfterBattleText @@ -195,9 +195,9 @@ CooltrainermBrianScript: end TrainerCooltrainerfReena: - trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, 0, CooltrainerfReena1Script + trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, 0, .Script -CooltrainerfReena1Script: +.Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA end_if_just_battled opentext @@ -288,9 +288,9 @@ UnknownScript_0x1a0a47: end TrainerCooltrainerfMegan: - trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, CooltrainerfMeganScript + trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, .Script -CooltrainerfMeganScript: +.Script: end_if_just_battled opentext writetext CooltrainerfMeganAfterBattleText @@ -320,7 +320,7 @@ UnknownText_0x1a0a6b: text "Hey!" done -UnknownText_0x1a0a71: +Route27FisherText: text "Do you know what" line "you just did?" @@ -496,4 +496,4 @@ Route27_MapEventHeader: person_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperJose2, -1 person_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM person_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY - person_event SPRITE_FISHER, 10, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 3, FisherScript_0x1a089c, -1 + person_event SPRITE_FISHER, 10, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 3, Route27FisherScript, -1 diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm index be5068078..d2fa5d5dc 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -9,13 +9,13 @@ Route2946Gate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x7b5bb: - jumptextfaceplayer UnknownText_0x7b5c1 +Route2946GateOfficerScript: + jumptextfaceplayer Route2946GateOfficerText -YoungsterScript_0x7b5be: - jumptextfaceplayer UnknownText_0x7b60d +Route2946GateYoungsterScript: + jumptextfaceplayer Route2946GateYoungsterText -UnknownText_0x7b5c1: +Route2946GateOfficerText: text "You can't climb" line "ledges." @@ -24,7 +24,7 @@ UnknownText_0x7b5c1: cont "take a shortcut." done -UnknownText_0x7b60d: +Route2946GateYoungsterText: text "Different kinds of" line "#MON appear" cont "past here." @@ -55,5 +55,5 @@ Route2946Gate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7b5bb, -1 - person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x7b5be, -1 + person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route2946GateOfficerScript, -1 + person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route2946GateYoungsterScript, -1 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index c3674b074..1647215b9 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -8,10 +8,10 @@ Route2Gate_MapScriptHeader: .MapCallbacks: db 0 -ScientistScript_0x9b952: - jumptextfaceplayer UnknownText_0x9b955 +Route2GateScientistScript: + jumptextfaceplayer Route2GateScientistText -UnknownText_0x9b955: +Route2GateScientistText: text "Are you ?" para "I work as PROF." @@ -44,4 +44,4 @@ Route2Gate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_SCIENTIST, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x9b952, -1 + person_event SPRITE_SCIENTIST, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route2GateScientistScript, -1 diff --git a/maps/Route3.asm b/maps/Route3.asm index 96159e7e3..5b5d9a1d2 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -12,9 +12,9 @@ Route3_MapScriptHeader: db 0 TrainerFirebreatherOtis: - trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, FirebreatherOtisScript + trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script -FirebreatherOtisScript: +.Script: end_if_just_battled opentext writetext FirebreatherOtisAfterBattleText @@ -23,9 +23,9 @@ FirebreatherOtisScript: end TrainerYoungsterWarren: - trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, YoungsterWarrenScript + trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, .Script -YoungsterWarrenScript: +.Script: end_if_just_battled opentext writetext YoungsterWarrenAfterBattleText @@ -34,9 +34,9 @@ YoungsterWarrenScript: end TrainerYoungsterJimmy: - trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, YoungsterJimmyScript + trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, .Script -YoungsterJimmyScript: +.Script: end_if_just_battled opentext writetext YoungsterJimmyAfterBattleText @@ -45,9 +45,9 @@ YoungsterJimmyScript: end TrainerFirebreatherBurt: - trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, FirebreatherBurtScript + trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, .Script -FirebreatherBurtScript: +.Script: end_if_just_battled opentext writetext FirebreatherBurtAfterBattleText diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 28b43d2d8..de72c9a51 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -9,19 +9,19 @@ Route31VioletGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x197634: - jumptextfaceplayer UnknownText_0x19763a +Route31VioletGateOfficerScript: + jumptextfaceplayer Route31VioletGateOfficerText -CooltrainerFScript_0x197637: - jumptextfaceplayer UnknownText_0x197661 +Route31VioletGateCooltrainerFScript: + jumptextfaceplayer Route31VioletGateCooltrainerFText -UnknownText_0x19763a: +Route31VioletGateOfficerText: text "Hi there!" line "Did you visit" cont "SPROUT TOWER?" done -UnknownText_0x197661: +Route31VioletGateCooltrainerFText: text "I came too far" line "out. I'd better" cont "phone home!" @@ -46,5 +46,5 @@ Route31VioletGate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x197634, -1 - person_event SPRITE_COOLTRAINER_F, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x197637, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1 + person_event SPRITE_COOLTRAINER_F, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1 diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 18c9622ee..bc9f4f0f8 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -42,8 +42,8 @@ UnknownScript_0x69b7a: closetext end -CooltrainerFScript_0x69b80: - jumptextfaceplayer UnknownText_0x69cac +Route32Pokecenter1FCooltrainerFScript: + jumptextfaceplayer Route32Pokecenter1FCooltrainerFText UnknownText_0x69b83: text "This is a great" @@ -85,7 +85,7 @@ UnknownText_0x69c8d: line "they biting?" done -UnknownText_0x69cac: +Route32Pokecenter1FCooltrainerFText: text "What should I make" line "my #MON hold?" @@ -114,4 +114,4 @@ Route32Pokecenter1F_MapEventHeader: db 3 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x69b52, -1 person_event SPRITE_FISHING_GURU, 4, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x69b80, -1 + person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1 diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index b530cbf5f..523fee2e9 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -10,16 +10,16 @@ Route32RuinsOfAlphGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x69a2d: - jumptextfaceplayer UnknownText_0x69a36 +Route32RuinsOfAlphGateOfficerScript: + jumptextfaceplayer Route32RuinsOfAlphGateOfficerText -PokefanMScript_0x69a30: - jumptextfaceplayer UnknownText_0x69a81 +Route32RuinsOfAlphGatePokefanMScript: + jumptextfaceplayer Route32RuinsOfAlphGatePokefanMText -YoungsterScript_0x69a33: - jumptextfaceplayer UnknownText_0x69abd +Route32RuinsOfAlphGateYoungsterScript: + jumptextfaceplayer Route32RuinsOfAlphGateYoungsterText -UnknownText_0x69a36: +Route32RuinsOfAlphGateOfficerText: text "RUINS OF ALPH" para "A Look-and-Touch" @@ -29,7 +29,7 @@ UnknownText_0x69a36: line "stone panels!" done -UnknownText_0x69a81: +Route32RuinsOfAlphGatePokefanMText: text "You're studying" line "the RUINS?" @@ -37,7 +37,7 @@ UnknownText_0x69a81: line "in the making." done -UnknownText_0x69abd: +Route32RuinsOfAlphGateYoungsterText: text "There are drawings" line "on stone panels." @@ -65,6 +65,6 @@ Route32RuinsOfAlphGate_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x69a2d, -1 - person_event SPRITE_POKEFAN_M, 2, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x69a30, -1 - person_event SPRITE_YOUNGSTER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x69a33, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1 + person_event SPRITE_POKEFAN_M, 2, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1 + person_event SPRITE_YOUNGSTER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1 diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 143a1adc9..d629eecdd 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -75,8 +75,8 @@ IlexGateButterfree: closetext end -LassScript_0x62d94: - jumptextfaceplayer UnknownText_0x62e97 +Route34IlexForestGateLassScript: + jumptextfaceplayer Route34IlexForestGateLassText MovementData_0x62d97: step UP @@ -121,7 +121,7 @@ UnknownText_0x62e83: text "BUTTERFREE: Freeh!" done -UnknownText_0x62e97: +Route34IlexForestGateLassText: text "Did you see the" line "shrine honoring" cont "the protector?" @@ -157,5 +157,5 @@ Route34IlexForestGate_MapEventHeader: db 4 person_event SPRITE_TEACHER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER person_event SPRITE_BUTTERFREE, 4, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, IlexGateButterfree, -1 - person_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x62d94, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS + person_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS person_event SPRITE_TEACHER, 7, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY diff --git a/maps/Route35.asm b/maps/Route35.asm index 8ce6adde7..7d5d2d48a 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -19,9 +19,9 @@ Route35_MapScriptHeader: db 0 TrainerBird_keeperBryan: - trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, 0, Bird_keeperBryanScript + trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, 0, .Script -Bird_keeperBryanScript: +.Script: end_if_just_battled opentext writetext Bird_keeperBryanAfterBattleText @@ -30,9 +30,9 @@ Bird_keeperBryanScript: end TrainerJugglerIrwin: - trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, JugglerIrwin1Script + trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, .Script -JugglerIrwin1Script: +.Script: writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN end_if_just_battled opentext @@ -85,9 +85,9 @@ UnknownScript_0x19c91b: end TrainerCamperIvan: - trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, CamperIvanScript + trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, .Script -CamperIvanScript: +.Script: end_if_just_battled opentext writetext CamperIvanAfterBattleText @@ -96,9 +96,9 @@ CamperIvanScript: end TrainerCamperElliot: - trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, CamperElliotScript + trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, .Script -CamperElliotScript: +.Script: end_if_just_battled opentext writetext CamperElliotAfterBattleText @@ -107,9 +107,9 @@ CamperElliotScript: end TrainerPicnickerBrooke: - trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, PicnickerBrookeScript + trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, .Script -PicnickerBrookeScript: +.Script: end_if_just_battled opentext writetext PicnickerBrookeAfterBattleText @@ -118,9 +118,9 @@ PicnickerBrookeScript: end TrainerPicnickerKim: - trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, PicnickerKimScript + trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, .Script -PicnickerKimScript: +.Script: end_if_just_battled opentext writetext PicnickerKimAfterBattleText @@ -129,9 +129,9 @@ PicnickerKimScript: end TrainerBug_catcherArnie1: - trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, 0, Bug_catcherArnie1Script + trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, 0, .Script -Bug_catcherArnie1Script: +.Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE end_if_just_battled opentext @@ -226,9 +226,9 @@ UnknownScript_0x19ca2f: end TrainerFirebreatherWalt: - trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, FirebreatherWaltScript + trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, .Script -FirebreatherWaltScript: +.Script: end_if_just_battled opentext writetext FirebreatherWaltAfterBattleText diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index e68250183..4cdf461df 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -91,8 +91,8 @@ PokefanFScript_0x69dc6: closetext end -FisherScript_0x69dda: - jumptextfaceplayer UnknownText_0x6a0cb +Route35GoldenrodGateFisherScript: + jumptextfaceplayer Route35GoldenrodGateFisherText UnknownText_0x69ddd: text "Excuse me, kid!" @@ -181,7 +181,7 @@ UnknownText_0x6a09a: cont "on the radio." done -UnknownText_0x6a0cb: +Route35GoldenrodGateFisherText: text "I wonder how many" line "kinds of #MON" @@ -216,4 +216,4 @@ Route35GoldenrodGate_MapEventHeader: db 3 person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1 person_event SPRITE_POKEFAN_F, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1 - person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x69dda, -1 + person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1 diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 1214827f8..935a8e518 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -199,8 +199,8 @@ OfficerScript_0x6a2ca: closetext end -YoungsterScript_0x6a2d8: - jumptextfaceplayer UnknownText_0x6a8d8 +Route35NationalParkGateYoungsterScript: + jumptextfaceplayer Route35NationalParkGateYoungsterText MapRoute36NationalParkGateSignpost0Script: jumptext UnknownText_0x6a90e @@ -411,7 +411,7 @@ UnknownText_0x6a894: line "give it a shot." done -UnknownText_0x6a8d8: +Route35NationalParkGateYoungsterText: text "When is the next" line "Bug-Catching Con-" cont "test going to be?" @@ -458,5 +458,5 @@ Route35NationalParkGate_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_OFFICER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY - person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6a2d8, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER + person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER person_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36.asm b/maps/Route36.asm index 5519a692b..d0accbaa7 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -310,7 +310,7 @@ TrainerPsychicMark: .Script: end_if_just_battled opentext - writetext UnknownText_0x19471e + writetext PsychicMarkAfterBattleText waitbutton closetext end @@ -553,7 +553,7 @@ PsychicMarkBeatenText: text "I misread you!" done -UnknownText_0x19471e: +PsychicMarkAfterBattleText: text "I'd be strong if" line "only I could tell" diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index e9fe6d2f5..95501862a 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -9,20 +9,20 @@ Route36RuinsOfAlphGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x6aa1a: - jumptextfaceplayer UnknownText_0x6aa20 +Route36RuinsOfAlphGateOfficerScript: + jumptextfaceplayer Route36RuinsOfAlphGateOfficerText -GrampsScript_0x6aa1d: - jumptextfaceplayer UnknownText_0x6aa5b +Route36RuinsOfAlphGateGrampsScript: + jumptextfaceplayer Route36RuinsOfAlphGateGrampsText -UnknownText_0x6aa20: +Route36RuinsOfAlphGateOfficerText: text "Don't you wonder" line "who'd make some-" cont "thing like this?" cont "And why?" done -UnknownText_0x6aa5b: +Route36RuinsOfAlphGateGrampsText: text "Did you see that" line "strange tree in" cont "the road?" @@ -53,5 +53,5 @@ Route36RuinsOfAlphGate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6aa1a, -1 - person_event SPRITE_GRAMPS, 5, 7, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x6aa1d, -1 + person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1 + person_event SPRITE_GRAMPS, 5, 7, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1 diff --git a/maps/Route37.asm b/maps/Route37.asm index 2b6ad223a..0c1c926b3 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -26,9 +26,9 @@ Route37_MapScriptHeader: return TrainerTwinsAnnandanne1: - trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, TwinsAnnandanne1Script + trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script -TwinsAnnandanne1Script: +.Script: end_if_just_battled opentext writetext TwinsAnnandanne1AfterBattleText @@ -37,9 +37,9 @@ TwinsAnnandanne1Script: end TrainerTwinsAnnandanne2: - trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, TwinsAnnandanne2Script + trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, .Script -TwinsAnnandanne2Script: +.Script: end_if_just_battled opentext writetext TwinsAnnandanne2AfterBattleText @@ -48,9 +48,9 @@ TwinsAnnandanne2Script: end TrainerPsychicGreg: - trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, PsychicGregScript + trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, .Script -PsychicGregScript: +.Script: end_if_just_battled opentext writetext PsychicGregAfterBattleText diff --git a/maps/Route38.asm b/maps/Route38.asm index a496ec99f..0f4227e8e 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -15,31 +15,31 @@ Route38_MapScriptHeader: db 0 TrainerBird_keeperToby: - trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, .script + trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, .Script -.script +.Script end_if_just_battled opentext - writetext UnknownText_0x1a1f86 + writetext Bird_keeperTobyAfterBattleText waitbutton closetext end TrainerSailorHarry: - trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .script + trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script -.script +.Script end_if_just_battled opentext - writetext UnknownText_0x1a220c + writetext SailorHarryAfterBattleText waitbutton closetext end TrainerLassDana1: - trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .script + trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .Script -.script +.Script writecode VAR_CALLERID, PHONE_LASS_DANA end_if_just_battled opentext @@ -175,9 +175,9 @@ TrainerLassDana1: end TrainerSchoolboyChad1: - trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .script + trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .Script -.script +.Script writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD end_if_just_battled opentext @@ -292,23 +292,23 @@ TrainerSchoolboyChad1: end TrainerBeautyValerie: - trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .script + trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script -.script +.Script end_if_just_battled opentext - writetext UnknownText_0x1a2185 + writetext BeautyValerieAfterBattleText waitbutton closetext end TrainerBeautyOlivia: - trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .script + trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script -.script +.Script end_if_just_battled opentext - writetext UnknownText_0x1a229a + writetext BeautyOliviaAfterBattleText waitbutton closetext end @@ -333,7 +333,7 @@ Bird_keeperTobyBeatenText: line "flying away now." done -UnknownText_0x1a1f86: +Bird_keeperTobyAfterBattleText: text "I plan to train in" line "CIANWOOD CITY to" @@ -400,7 +400,7 @@ BeautyValerieBeatenText: line "see your #MON!" done -UnknownText_0x1a2185: +BeautyValerieAfterBattleText: text "When I see #-" line "MON, it seems to" cont "soothe my nerves." @@ -419,7 +419,7 @@ SailorHarryBeatenText: line "world class!" done -UnknownText_0x1a220c: +SailorHarryAfterBattleText: text "All kinds of peo-" line "ple around the" @@ -438,7 +438,7 @@ BeautyOliviaBeatenText: line "MILK every day." done -UnknownText_0x1a229a: +BeautyOliviaAfterBattleText: text "MOOMOO MILK is" line "good for beauty" diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index 3516c72c9..f61bcaaa4 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -8,10 +8,10 @@ Route38EcruteakGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x9cbd7: - jumptextfaceplayer UnknownText_0x9cbda +Route38EcruteakGateOfficerScript: + jumptextfaceplayer Route38EcruteakGateOfficerText -UnknownText_0x9cbda: +Route38EcruteakGateOfficerText: text "Where did you say" line "you're from?" @@ -43,4 +43,4 @@ Route38EcruteakGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x9cbd7, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1 diff --git a/maps/Route39.asm b/maps/Route39.asm index 48690345e..54e1426a5 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -26,9 +26,9 @@ Route39Miltank: end TrainerPokefanmDerek1: - trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, 0, PokefanmDerek1Script + trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, 0, .Script -PokefanmDerek1Script: +.Script: writecode VAR_CALLERID, PHONE_POKEFANM_DEREK end_if_just_battled opentext @@ -105,9 +105,9 @@ PackIsFull: end TrainerPokefanfRuth: - trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, PokefanfRuthScript + trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, .Script -PokefanfRuthScript: +.Script: end_if_just_battled opentext writetext PokefanfRuthAfterBattleText @@ -116,9 +116,9 @@ PokefanfRuthScript: end TrainerSailorEugene: - trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, SailorEugeneScript + trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, .Script -SailorEugeneScript: +.Script: end_if_just_battled opentext writetext SailorEugeneAfterBattleText @@ -127,9 +127,9 @@ SailorEugeneScript: end TrainerPsychicNorman: - trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, PsychicNormanScript + trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, .Script -PsychicNormanScript: +.Script: end_if_just_battled opentext writetext PsychicNormanAfterBattleText diff --git a/maps/Route4.asm b/maps/Route4.asm index b674afdad..4f6207cf3 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -12,9 +12,9 @@ Route4_MapScriptHeader: db 0 TrainerBird_keeperHank: - trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, 0, Bird_keeperHankScript + trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, 0, .Script -Bird_keeperHankScript: +.Script: end_if_just_battled opentext writetext Bird_keeperHankAfterBattleText @@ -23,9 +23,9 @@ Bird_keeperHankScript: end TrainerPicnickerHope: - trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, PicnickerHopeScript + trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, .Script -PicnickerHopeScript: +.Script: end_if_just_battled opentext writetext PicnickerHopeAfterBattleText @@ -34,9 +34,9 @@ PicnickerHopeScript: end TrainerPicnickerSharon: - trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, PicnickerSharonScript + trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, .Script -PicnickerSharonScript: +.Script: end_if_just_battled opentext writetext PicnickerSharonAfterBattleText diff --git a/maps/Route40.asm b/maps/Route40.asm index bbf90ab75..65f36135a 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -32,9 +32,9 @@ Route40_MapScriptHeader: return TrainerSwimmerfElaine: - trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, SwimmerfElaineScript + trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script -SwimmerfElaineScript: +.Script: end_if_just_battled opentext writetext SwimmerfElaineAfterBattleText @@ -43,9 +43,9 @@ SwimmerfElaineScript: end TrainerSwimmerfPaula: - trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, SwimmerfPaulaScript + trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, .Script -SwimmerfPaulaScript: +.Script: end_if_just_battled opentext writetext SwimmerfPaulaAfterBattleText @@ -54,9 +54,9 @@ SwimmerfPaulaScript: end TrainerSwimmermSimon: - trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, SwimmermSimonScript + trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, .Script -SwimmermSimonScript: +.Script: end_if_just_battled opentext writetext SwimmermSimonAfterBattleText @@ -65,9 +65,9 @@ SwimmermSimonScript: end TrainerSwimmermRandall: - trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, SwimmermRandallScript + trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, .Script -SwimmermRandallScript: +.Script: end_if_just_battled opentext writetext SwimmermRandallAfterBattleText @@ -75,8 +75,8 @@ SwimmermRandallScript: closetext end -LassScript_0x1a61c4: - jumptextfaceplayer UnknownText_0x1a6429 +Route40Lass1Script: + jumptextfaceplayer Route40Lass1Text PokefanMScript_0x1a61c7: special Mobile_DummyReturnFalse @@ -86,11 +86,11 @@ PokefanMScript_0x1a61c7: .mobile jumptextfaceplayer UnknownText_0x1a649b -LassScript_0x1a61d3: - jumptextfaceplayer UnknownText_0x1a64e6 +Route40Lass2Script: + jumptextfaceplayer Route40Lass2Text -StandingYoungsterScript_0x1a61d6: - jumptextfaceplayer UnknownText_0x1a6564 +Route40StandingYoungsterScript: + jumptextfaceplayer Route40StandingYoungsterText MonicaScript: faceplayer @@ -235,7 +235,7 @@ SwimmerfPaulaAfterBattleText: cont "carry me along." done -UnknownText_0x1a6429: +Route40Lass1Text: text "Although you can't" line "see it from here," @@ -259,7 +259,7 @@ UnknownText_0x1a649b: para "What? What?" done -UnknownText_0x1a64e6: +Route40Lass2Text: text "I came to OLIVINE" line "by ship to see the" @@ -271,7 +271,7 @@ UnknownText_0x1a64e6: cont "from a big city." done -UnknownText_0x1a6564: +Route40StandingYoungsterText: text "Have you gone to" line "the BATTLE TOWER?" @@ -362,8 +362,8 @@ Route40_MapEventHeader: person_event SPRITE_ROCK, 11, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Rock, -1 person_event SPRITE_ROCK, 9, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Rock, -1 person_event SPRITE_ROCK, 8, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Rock, -1 - person_event SPRITE_LASS, 13, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1a61c4, -1 + person_event SPRITE_LASS, 13, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Lass1Script, -1 person_event SPRITE_BUENA, 10, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY person_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1 - person_event SPRITE_LASS, 4, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x1a61d3, -1 - person_event SPRITE_STANDING_YOUNGSTER, 9, 16, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a61d6, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + person_event SPRITE_LASS, 4, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route40Lass2Script, -1 + person_event SPRITE_STANDING_YOUNGSTER, 9, 16, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 0f8b139c7..238686d9d 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -14,11 +14,11 @@ Route40BattleTowerGate_MapScriptHeader: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR return -RockerScript_0x9f669: - jumptextfaceplayer UnknownText_0x9f716 +Route40BattleTowerGateRockerScript: + jumptextfaceplayer Route40BattleTowerGateRockerText -TwinScript_0x9f66c: - jumptextfaceplayer UnknownText_0x9f7c8 +Route40BattleTowerGateTwinScript: + jumptextfaceplayer Route40BattleTowerGateTwinText UnknownText_0x9f66f: text "Did you come to" @@ -40,7 +40,7 @@ UnknownText_0x9f6ba: line "when I win." done -UnknownText_0x9f716: +Route40BattleTowerGateRockerText: text "Are you going to" line "the BATTLE TOWER?" @@ -59,7 +59,7 @@ UnknownText_0x9f783: line "the BATTLE TOWER." done -UnknownText_0x9f7c8: +Route40BattleTowerGateTwinText: text "The levels of the" line "#MON I want to" @@ -89,5 +89,5 @@ Route40BattleTowerGate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_ROCKER, 3, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, RockerScript_0x9f669, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR - person_event SPRITE_TWIN, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TwinScript_0x9f66c, -1 + person_event SPRITE_ROCKER, 3, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + person_event SPRITE_TWIN, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1 diff --git a/maps/Route41.asm b/maps/Route41.asm index 174909216..3ff1bb587 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -18,9 +18,9 @@ Route41_MapScriptHeader: db 0 TrainerSwimmerfKaylee: - trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, SwimmerfKayleeScript + trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script -SwimmerfKayleeScript: +.Script: end_if_just_battled opentext writetext SwimmerfKayleeAfterBattleText @@ -29,9 +29,9 @@ SwimmerfKayleeScript: end TrainerSwimmerfSusie: - trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, SwimmerfSusieScript + trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, .Script -SwimmerfSusieScript: +.Script: end_if_just_battled opentext writetext SwimmerfSusieAfterBattleText @@ -40,9 +40,9 @@ SwimmerfSusieScript: end TrainerSwimmerfDenise: - trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, SwimmerfDeniseScript + trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, .Script -SwimmerfDeniseScript: +.Script: end_if_just_battled opentext writetext SwimmerfDeniseAfterBattleText @@ -51,9 +51,9 @@ SwimmerfDeniseScript: end TrainerSwimmerfKara: - trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, SwimmerfKaraScript + trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, .Script -SwimmerfKaraScript: +.Script: end_if_just_battled opentext writetext SwimmerfKaraAfterBattleText @@ -62,9 +62,9 @@ SwimmerfKaraScript: end TrainerSwimmerfWendy: - trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, SwimmerfWendyScript + trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, .Script -SwimmerfWendyScript: +.Script: end_if_just_battled opentext writetext SwimmerfWendyAfterBattleText @@ -73,9 +73,9 @@ SwimmerfWendyScript: end TrainerSwimmermCharlie: - trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, SwimmermCharlieScript + trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, .Script -SwimmermCharlieScript: +.Script: end_if_just_battled opentext writetext SwimmermCharlieAfterBattleText @@ -84,9 +84,9 @@ SwimmermCharlieScript: end TrainerSwimmermGeorge: - trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, SwimmermGeorgeScript + trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, .Script -SwimmermGeorgeScript: +.Script: end_if_just_battled opentext writetext SwimmermGeorgeAfterBattleText @@ -95,9 +95,9 @@ SwimmermGeorgeScript: end TrainerSwimmermBerke: - trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, SwimmermBerkeScript + trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, .Script -SwimmermBerkeScript: +.Script: end_if_just_battled opentext writetext SwimmermBerkeAfterBattleText @@ -106,9 +106,9 @@ SwimmermBerkeScript: end TrainerSwimmermKirk: - trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, SwimmermKirkScript + trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, .Script -SwimmermKirkScript: +.Script: end_if_just_battled opentext writetext SwimmermKirkAfterBattleText @@ -117,9 +117,9 @@ SwimmermKirkScript: end TrainerSwimmermMathew: - trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, SwimmermMathewScript + trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, .Script -SwimmermMathewScript: +.Script: end_if_just_battled opentext writetext SwimmermMathewAfterBattleText diff --git a/maps/Route42.asm b/maps/Route42.asm index 99bb953cb..eab7e282c 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -37,9 +37,9 @@ Route42SuicuneScript: end TrainerFisherTully1: - trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, 0, FisherTully1Script + trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, 0, .Script -FisherTully1Script: +.Script: writecode VAR_CALLERID, PHONE_FISHER_TULLY end_if_just_battled opentext @@ -163,9 +163,9 @@ UnknownScript_0x1a9311: end TrainerPokemaniacShane: - trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, PokemaniacShaneScript + trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script -PokemaniacShaneScript: +.Script: end_if_just_battled opentext writetext PokemaniacShaneAfterBattleText @@ -174,9 +174,9 @@ PokemaniacShaneScript: end TrainerHikerBenjamin: - trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, HikerBenjaminScript + trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script -HikerBenjaminScript: +.Script: end_if_just_battled opentext writetext HikerBenjaminAfterBattleText diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index e014340e4..ae13507e7 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -8,10 +8,10 @@ Route42EcruteakGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x19a4b5: - jumptextfaceplayer UnknownText_0x19a4b8 +Route42EcruteakGateOfficerScript: + jumptextfaceplayer Route42EcruteakGateOfficerText -UnknownText_0x19a4b8: +Route42EcruteakGateOfficerText: text "MT.MORTAR is like" line "a maze inside." @@ -38,4 +38,4 @@ Route42EcruteakGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19a4b5, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1 diff --git a/maps/Route43.asm b/maps/Route43.asm index dcb0d70be..d3e16b3df 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -27,9 +27,9 @@ Route43_MapScriptHeader: return TrainerCamperSpencer: - trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, CamperSpencerScript + trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script -CamperSpencerScript: +.Script: end_if_just_battled opentext writetext CamperSpencerAfterBattleText @@ -38,9 +38,9 @@ CamperSpencerScript: end TrainerPokemaniacBen: - trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, PokemaniacBenScript + trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, .Script -PokemaniacBenScript: +.Script: end_if_just_battled opentext writetext PokemaniacBenAfterBattleText @@ -49,9 +49,9 @@ PokemaniacBenScript: end TrainerPokemaniacBrent1: - trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, 0, PokemaniacBrent1Script + trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, 0, .Script -PokemaniacBrent1Script: +.Script: writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT end_if_just_battled opentext @@ -154,9 +154,9 @@ UnknownScript_0x19d144: end TrainerPokemaniacRon: - trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, PokemaniacRonScript + trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, .Script -PokemaniacRonScript: +.Script: end_if_just_battled opentext writetext PokemaniacRonAfterBattleText @@ -165,9 +165,9 @@ PokemaniacRonScript: end TrainerFisherMarvin: - trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, FisherMarvinScript + trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, .Script -FisherMarvinScript: +.Script: end_if_just_battled opentext writetext FisherMarvinAfterBattleText @@ -176,9 +176,9 @@ FisherMarvinScript: end TrainerPicnickerTiffany3: - trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, 0, PicnickerTiffany3Script + trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, 0, .Script -PicnickerTiffany3Script: +.Script: writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY end_if_just_battled opentext diff --git a/maps/Route44.asm b/maps/Route44.asm index dc24e8ddb..31c8a9c92 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -19,9 +19,9 @@ Route44_MapScriptHeader: db 0 TrainerBird_keeperVance1: - trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, Bird_keeperVance1SeenText, Bird_keeperVance1BeatenText, 0, Bird_keeperVance1Script + trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, Bird_keeperVance1SeenText, Bird_keeperVance1BeatenText, 0, .Script -Bird_keeperVance1Script: +.Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE end_if_just_battled opentext @@ -150,9 +150,9 @@ UnknownScript_0x19d90a: end TrainerPsychicPhil: - trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, PsychicPhilScript + trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, .Script -PsychicPhilScript: +.Script: end_if_just_battled opentext writetext PsychicPhilAfterBattleText @@ -161,9 +161,9 @@ PsychicPhilScript: end TrainerFisherWilton1: - trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, 0, FisherWilton1Script + trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, 0, .Script -FisherWilton1Script: +.Script: writecode VAR_CALLERID, PHONE_FISHER_WILTON end_if_just_battled opentext @@ -256,9 +256,9 @@ UnknownScript_0x19d9e7: jump UnknownScript_0x19d8ff TrainerFisherEdgar: - trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, FisherEdgarScript + trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script -FisherEdgarScript: +.Script: end_if_just_battled opentext writetext FisherEdgarAfterBattleText @@ -267,9 +267,9 @@ FisherEdgarScript: end TrainerCooltrainerfCybil: - trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, CooltrainerfCybilScript + trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, .Script -CooltrainerfCybilScript: +.Script: end_if_just_battled opentext writetext CooltrainerfCybilAfterBattleText @@ -278,9 +278,9 @@ CooltrainerfCybilScript: end TrainerPokemaniacZach: - trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, PokemaniacZachScript + trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, .Script -PokemaniacZachScript: +.Script: end_if_just_battled opentext writetext PokemaniacZachAfterBattleText @@ -289,9 +289,9 @@ PokemaniacZachScript: end TrainerCooltrainermAllen: - trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, CooltrainermAllenScript + trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, .Script -CooltrainermAllenScript: +.Script: end_if_just_battled opentext writetext CooltrainermAllenAfterBattleText diff --git a/maps/Route45.asm b/maps/Route45.asm index 8caac5aa6..7232e3494 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -21,9 +21,9 @@ Route45_MapScriptHeader: db 0 TrainerBlackbeltKenji: - trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, BlackbeltKenji3Script + trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script -BlackbeltKenji3Script: +.Script: writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI end_if_just_battled opentext @@ -125,9 +125,9 @@ UnknownScript_0x19e146: end TrainerHikerErik: - trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, 0, HikerErikScript + trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, 0, .Script -HikerErikScript: +.Script: end_if_just_battled opentext writetext HikerErikAfterBattleText @@ -136,9 +136,9 @@ HikerErikScript: end TrainerHikerMichael: - trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, HikerMichaelScript + trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, .Script -HikerMichaelScript: +.Script: end_if_just_battled opentext writetext HikerMichaelAfterBattleText @@ -147,9 +147,9 @@ HikerMichaelScript: end TrainerHikerParry: - trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, 0, HikerParry3Script + trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, 0, .Script -HikerParry3Script: +.Script: writecode VAR_CALLERID, PHONE_HIKER_PARRY end_if_just_battled opentext @@ -233,9 +233,9 @@ UnknownScript_0x19e219: jump UnknownScript_0x19e127 TrainerHikerTimothy: - trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, HikerTimothyScript + trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script -HikerTimothyScript: +.Script: end_if_just_battled opentext writetext HikerTimothyAfterBattleText @@ -244,9 +244,9 @@ HikerTimothyScript: end TrainerCooltrainermRyan: - trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, CooltrainermRyanScript + trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, .Script -CooltrainermRyanScript: +.Script: end_if_just_battled opentext writetext CooltrainermRyanAfterBattleText @@ -255,9 +255,9 @@ CooltrainermRyanScript: end TrainerCooltrainerfKelly: - trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, CooltrainerfKellyScript + trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, .Script -CooltrainerfKellyScript: +.Script: end_if_just_battled opentext writetext CooltrainerfKellyAfterBattleText diff --git a/maps/Route46.asm b/maps/Route46.asm index 0a1a52d9e..e6c8d2cf2 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -14,9 +14,9 @@ Route46_MapScriptHeader: db 0 TrainerCamperTed: - trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, CamperTedScript + trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script -CamperTedScript: +.Script: end_if_just_battled opentext writetext CamperTedAfterBattleText @@ -25,9 +25,9 @@ CamperTedScript: end TrainerPicnickerErin1: - trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, PicnickerErin1Script + trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, .Script -PicnickerErin1Script: +.Script: writecode VAR_CALLERID, PHONE_PICNICKER_ERIN end_if_just_battled opentext @@ -148,9 +148,9 @@ UnknownScript_0x1a9772: end TrainerHikerBailey: - trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, HikerBaileyScript + trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, .Script -HikerBaileyScript: +.Script: end_if_just_battled opentext writetext HikerBaileyAfterBattleText diff --git a/maps/Route5.asm b/maps/Route5.asm index d534faefd..734748f19 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -8,8 +8,8 @@ Route5_MapScriptHeader: .MapCallbacks: db 0 -PokefanMScript_0x1adb19: - jumptextfaceplayer UnknownText_0x1adb22 +Route5PokefanMScript: + jumptextfaceplayer Route5PokefanMText Route5UndergroundPathSign: jumptext Route5UndergroundPathSignText @@ -17,7 +17,7 @@ Route5UndergroundPathSign: HouseForSaleSign: jumptext HouseForSaleSignText -UnknownText_0x1adb22: +Route5PokefanMText: text "The road is closed" line "until the problem" @@ -60,4 +60,4 @@ Route5_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKEFAN_M, 16, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1adb19, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + person_event SPRITE_POKEFAN_M, 16, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route5PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 9dec30107..9736deb70 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -26,8 +26,8 @@ UnknownScript_0x18b64d: closetext end -TeacherScript_0x18b64f: - jumptextfaceplayer UnknownText_0x18b6de +Route5CleanseTagSpeechHouseTeacherScript: + jumptextfaceplayer Route5CleanseTagSpeechHouseTeacherText HouseForSaleBookshelf: jumpstd difficultbookshelf @@ -49,7 +49,7 @@ UnknownText_0x18b6a7: cont "are protected now." done -UnknownText_0x18b6de: +Route5CleanseTagSpeechHouseTeacherText: text "My grandma is into" line "warding off what" @@ -80,4 +80,4 @@ Route5CleanseTagSpeechHouse_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_GRANNY, 5, 2, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1 - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18b64f, -1 + person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route5CleanseTagSpeechHouseTeacherScript, -1 diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index fd3707ff2..c57c9e59e 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -8,10 +8,10 @@ Route5SaffronCityGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x18b5b9: - jumptextfaceplayer UnknownText_0x18b5bc +Route5SaffronCityGateOfficerScript: + jumptextfaceplayer Route5SaffronCityGateOfficerText -UnknownText_0x18b5bc: +Route5SaffronCityGateOfficerText: text "You're from JOHTO," line "aren't you?" @@ -39,4 +39,4 @@ Route5SaffronCityGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x18b5b9, -1 + person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route5SaffronCityGateOfficerScript, -1 diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm index b43587d4d..dbbe22ad0 100644 --- a/maps/Route5UndergroundEntrance.asm +++ b/maps/Route5UndergroundEntrance.asm @@ -8,10 +8,10 @@ Route5UndergroundEntrance_MapScriptHeader: .MapCallbacks: db 0 -TeacherScript_0x18b555: - jumptextfaceplayer UnknownText_0x18b558 +Route5UndergroundEntranceTeacherScript: + jumptextfaceplayer Route5UndergroundEntranceTeacherText -UnknownText_0x18b558: +Route5UndergroundEntranceTeacherText: text "Many cities in" line "JOHTO have long" @@ -37,4 +37,4 @@ Route5UndergroundEntrance_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_TEACHER, 2, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18b555, -1 + person_event SPRITE_TEACHER, 2, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route5UndergroundEntranceTeacherScript, -1 diff --git a/maps/Route6.asm b/maps/Route6.asm index 583398c9b..abf56e013 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -11,9 +11,9 @@ Route6_MapScriptHeader: db 0 TrainerPokefanmRex: - trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, PokefanmRexScript + trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script -PokefanmRexScript: +.Script: end_if_just_battled opentext writetext PokefanmRexAfterBattleText @@ -22,9 +22,9 @@ PokefanmRexScript: end TrainerPokefanmAllan: - trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, PokefanmAllanScript + trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, .Script -PokefanmAllanScript: +.Script: end_if_just_battled opentext writetext PokefanmAllanAfterBattleText @@ -32,13 +32,13 @@ PokefanmAllanScript: closetext end -PokefanMScript_0x1ad951: - jumptextfaceplayer UnknownText_0x1ad957 +Route6PokefanMScript: + jumptextfaceplayer Route6PokefanMText Route6UndergroundPathSign: jumptext Route6UndergroundPathSignText -UnknownText_0x1ad957: +Route6PokefanMText: text "The road is closed" line "until the problem" @@ -109,6 +109,6 @@ Route6_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_POKEFAN_M, 4, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 2, PokefanMScript_0x1ad951, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + person_event SPRITE_POKEFAN_M, 4, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH person_event SPRITE_POKEFAN_M, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, TrainerPokefanmRex, -1 person_event SPRITE_POKEFAN_M, 12, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, TrainerPokefanmAllan, -1 diff --git a/maps/Route8.asm b/maps/Route8.asm index 840547185..33e97f0e7 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -14,9 +14,9 @@ Route8_MapScriptHeader: db 0 TrainerBikerDwayne: - trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, BikerDwayneScript + trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script -BikerDwayneScript: +.Script: end_if_just_battled opentext writetext BikerDwayneAfterBattleText @@ -25,9 +25,9 @@ BikerDwayneScript: end TrainerBikerHarris: - trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, BikerHarrisScript + trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, .Script -BikerHarrisScript: +.Script: end_if_just_battled opentext writetext BikerHarrisAfterBattleText @@ -36,9 +36,9 @@ BikerHarrisScript: end TrainerBikerZeke: - trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, BikerZekeScript + trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, .Script -BikerZekeScript: +.Script: end_if_just_battled opentext writetext BikerZekeAfterBattleText @@ -47,9 +47,9 @@ BikerZekeScript: end TrainerSupernerdSam: - trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, SupernerdSamScript + trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, .Script -SupernerdSamScript: +.Script: end_if_just_battled opentext writetext SupernerdSamAfterBattleText @@ -58,9 +58,9 @@ SupernerdSamScript: end TrainerSupernerdTom: - trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, SupernerdTomScript + trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, .Script -SupernerdTomScript: +.Script: end_if_just_battled opentext writetext SupernerdTomAfterBattleText diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index a7947b4de..44908079f 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -8,10 +8,10 @@ Route8SaffronGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x7f416: - jumptextfaceplayer UnknownText_0x7f419 +Route8SaffronGateOfficerScript: + jumptextfaceplayer Route8SaffronGateOfficerText -UnknownText_0x7f419: +Route8SaffronGateOfficerText: text "Have you been to" line "LAVENDER TOWN?" @@ -38,4 +38,4 @@ Route8SaffronGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7f416, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1 diff --git a/maps/Route9.asm b/maps/Route9.asm index e5c0df2db..e41f0efd6 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -14,9 +14,9 @@ Route9_MapScriptHeader: db 0 TrainerCamperDean: - trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, CamperDeanScript + trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script -CamperDeanScript: +.Script: end_if_just_battled opentext writetext CamperDeanAfterBattleText @@ -25,9 +25,9 @@ CamperDeanScript: end TrainerPicnickerHeidi: - trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, PicnickerHeidiScript + trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, .Script -PicnickerHeidiScript: +.Script: end_if_just_battled opentext writetext PicnickerHeidiAfterBattleText @@ -36,9 +36,9 @@ PicnickerHeidiScript: end TrainerCamperSid: - trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, 0, CamperSidScript + trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, 0, .Script -CamperSidScript: +.Script: end_if_just_battled opentext writetext CamperSidAfterBattleText @@ -47,9 +47,9 @@ CamperSidScript: end TrainerPicnickerEdna: - trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, PicnickerEdnaScript + trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, .Script -PicnickerEdnaScript: +.Script: end_if_just_battled opentext writetext PicnickerEdnaAfterBattleText @@ -58,9 +58,9 @@ PicnickerEdnaScript: end TrainerHikerTim: - trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, 0, HikerTimScript + trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, 0, .Script -HikerTimScript: +.Script: end_if_just_battled opentext writetext HikerTimAfterBattleText @@ -69,9 +69,9 @@ HikerTimScript: end TrainerHikerSidney: - trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, HikerSidneyScript + trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, .Script -HikerSidneyScript: +.Script: end_if_just_battled opentext writetext HikerSidneyAfterBattleText diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index b91d46275..d70ce63b2 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -51,8 +51,8 @@ RuinsOfAlphKabutoChamber_MapScriptHeader: closetext end -ReceptionistScript_0x58769: - jumptextfaceplayer UnknownText_0x58800 +RuinsOfAlphKabutoChamberReceptionistScript: + jumptextfaceplayer RuinsOfAlphKabutoChamberReceptionistText MapRuinsOfAlphKabutoChamberSignpost2Script: refreshscreen $0 @@ -147,7 +147,7 @@ MovementData_0x587fe: db $59 ; movement step_end -UnknownText_0x58800: +RuinsOfAlphKabutoChamberReceptionistText: text "Welcome to this" line "chamber." @@ -281,5 +281,5 @@ RuinsOfAlphKabutoChamber_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_RECEPTIONIST, 5, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x58769, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST + person_event SPRITE_RECEPTIONIST, 5, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST person_event SPRITE_SCIENTIST, 1, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1 diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index f18e8d99b..687133219 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -102,9 +102,9 @@ YoungsterScript_0x5807e: end TrainerPsychicNathan: - trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, PsychicNathanScript + trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, .Script -PsychicNathanScript: +.Script: end_if_just_battled opentext writetext PsychicNathanAfterBattleText @@ -114,12 +114,12 @@ PsychicNathanScript: TrainerSuperNerdStan: - trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, UnknownScript_0x580a9 + trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script -UnknownScript_0x580a9: +.Script: end_if_just_battled opentext - writetext UnknownText_0x58250 + writetext SuperNerdStanAfterBattleText waitbutton closetext end @@ -194,7 +194,7 @@ UnknownText_0x58217: line "understanding…" done -UnknownText_0x58250: +SuperNerdStanAfterBattleText: text "The RUINS are from" line "about 1500 years" cont "ago." diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 4b50f427c..7613c17a3 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -52,11 +52,11 @@ UnknownScript_0x19934c: closetext end -CooltrainerMScript_0x199352: - jumptextfaceplayer UnknownText_0x1994fe +SaffronCityCooltrainerMScript: + jumptextfaceplayer SaffronCityCooltrainerMText -CooltrainerFScript_0x199355: - jumptextfaceplayer UnknownText_0x19958e +SaffronCityCooltrainerFScript: + jumptextfaceplayer SaffronCityCooltrainerFText FisherScript_0x199358: faceplayer @@ -74,14 +74,14 @@ UnknownScript_0x199366: closetext end -YoungsterScript_0x19936c: - jumptextfaceplayer UnknownText_0x1996a5 +SaffronCityYoungster1Script: + jumptextfaceplayer SaffronCityYoungster1Text -YoungsterScript_0x19936f: - jumptextfaceplayer UnknownText_0x1996e5 +SaffronCityYoungster2Script: + jumptextfaceplayer SaffronCityYoungster2Text -LassScript_0x199372: - jumptextfaceplayer UnknownText_0x199745 +SaffronCityLassScript: + jumptextfaceplayer SaffronCityLassText SaffronCitySign: jumptext SaffronCitySignText @@ -148,7 +148,7 @@ UnknownText_0x1994ae: cont "the MAGNET TRAIN." done -UnknownText_0x1994fe: +SaffronCityCooltrainerMText: text "I went to the GYM," line "raring for battles" cont "against trainers…" @@ -163,7 +163,7 @@ UnknownText_0x1994fe: line "embarrassed." done -UnknownText_0x19958e: +SaffronCityCooltrainerFText: text "This is SILPH CO.," line "famous for #MON" cont "merchandise." @@ -196,7 +196,7 @@ UnknownText_0x19964b: line "Haaah, I'm full!" done -UnknownText_0x1996a5: +SaffronCityYoungster1Text: text "Going into an" line "alley for the" @@ -204,7 +204,7 @@ UnknownText_0x1996a5: line "me sorta anxious." done -UnknownText_0x1996e5: +SaffronCityYoungster2Text: text "There's a place" line "called TRAINER" @@ -215,7 +215,7 @@ UnknownText_0x1996e5: line "over the place." done -UnknownText_0x199745: +SaffronCityLassText: text "Our city was" line "featured on a" cont "radio program." @@ -305,9 +305,9 @@ SaffronCity_MapEventHeader: db 8 person_event SPRITE_LASS, 14, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LassScript_0x19932a, -1 person_event SPRITE_POKEFAN_M, 30, 19, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1 - person_event SPRITE_COOLTRAINER_M, 7, 32, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x199352, -1 - person_event SPRITE_COOLTRAINER_F, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x199355, -1 + person_event SPRITE_COOLTRAINER_M, 7, 32, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1 + person_event SPRITE_COOLTRAINER_F, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SaffronCityCooltrainerFScript, -1 person_event SPRITE_FISHER, 12, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x199358, -1 - person_event SPRITE_YOUNGSTER, 19, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19936c, -1 - person_event SPRITE_YOUNGSTER, 22, 35, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19936f, -1 - person_event SPRITE_LASS, 8, 19, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x199372, -1 + person_event SPRITE_YOUNGSTER, 19, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SaffronCityYoungster1Script, -1 + person_event SPRITE_YOUNGSTER, 22, 35, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SaffronCityYoungster2Script, -1 + person_event SPRITE_LASS, 8, 19, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SaffronCityLassScript, -1 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index b8c4932d7..0e4385b83 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -47,9 +47,9 @@ SabrinaScript_0x189c2e: end TrainerMediumRebecca: - trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, MediumRebeccaScript + trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script -MediumRebeccaScript: +.Script: end_if_just_battled opentext writetext MediumRebeccaAfterBattleText @@ -58,9 +58,9 @@ MediumRebeccaScript: end TrainerPsychicFranklin: - trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, PsychicFranklinScript + trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script -PsychicFranklinScript: +.Script: end_if_just_battled opentext writetext PsychicFranklinAfterBattleText @@ -69,9 +69,9 @@ PsychicFranklinScript: end TrainerMediumDoris: - trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, MediumDorisScript + trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script -MediumDorisScript: +.Script: end_if_just_battled opentext writetext MediumDorisAfterBattleText @@ -80,9 +80,9 @@ MediumDorisScript: end TrainerPsychicJared: - trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, PsychicJaredScript + trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script -PsychicJaredScript: +.Script: end_if_just_battled opentext writetext PsychicJaredAfterBattleText diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 5d81bee19..edef6f75c 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -16,19 +16,19 @@ ClerkScript_0x18a3bf: closetext end -CooltrainerMScript_0x18a3c6: - jumptextfaceplayer UnknownText_0x18a3cc +SaffronMartCooltrainerMScript: + jumptextfaceplayer SaffronMartCooltrainerMText -CooltrainerFScript_0x18a3c9: - jumptextfaceplayer UnknownText_0x18a3f3 +SaffronMartCooltrainerFScript: + jumptextfaceplayer SaffronMartCooltrainerFText -UnknownText_0x18a3cc: +SaffronMartCooltrainerMText: text "There's a big" line "RADIO TOWER in" cont "LAVENDER." done -UnknownText_0x18a3f3: +SaffronMartCooltrainerFText: text "I want to become" line "stronger, but I'm" cont "not good yet…" @@ -55,5 +55,5 @@ SaffronMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1 - person_event SPRITE_COOLTRAINER_M, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x18a3c6, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18a3c9, -1 + person_event SPRITE_COOLTRAINER_M, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1 + person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1 diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index 975ea587c..dfa0494d7 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -38,8 +38,8 @@ FisherScript_0x18a48c: closetext end -YoungsterScript_0x18a4a0: - jumptextfaceplayer UnknownText_0x18a6c5 +SaffronPokecenter1FYoungsterScript: + jumptextfaceplayer SaffronPokecenter1FYoungsterText UnknownText_0x18a4a3: text "What are JOHTO's" @@ -100,7 +100,7 @@ UnknownText_0x18a62e: cont "knowledge." done -UnknownText_0x18a6c5: +SaffronPokecenter1FYoungsterText: text "SILPH CO.'s HEAD" line "OFFICE and the" @@ -132,4 +132,4 @@ SaffronPokecenter1F_MapEventHeader: person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1 person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1 person_event SPRITE_FISHER, 6, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1 - person_event SPRITE_YOUNGSTER, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x18a4a0, -1 + person_event SPRITE_YOUNGSTER, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1 diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index f6599a6ed..bfe878439 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -86,11 +86,11 @@ UnknownScript_0x18a883: closetext end -TeacherScript_0x18a889: - jumptextfaceplayer UnknownText_0x18aaab +SaffronTrainStationTeacherScript: + jumptextfaceplayer SaffronTrainStationTeacherText -LassScript_0x18a88c: - jumptextfaceplayer UnknownText_0x18ab20 +SaffronTrainStationLassScript: + jumptextfaceplayer SaffronTrainStationLassText MovementData_0x18a88f: step UP @@ -192,7 +192,7 @@ UnknownText_0x18aa61: line "KANTO and JOHTO?" done -UnknownText_0x18aaab: +SaffronTrainStationTeacherText: text "Before the MAGNET" line "TRAIN STATION was" @@ -204,7 +204,7 @@ UnknownText_0x18aaab: cont "to live there." done -UnknownText_0x18ab20: +SaffronTrainStationLassText: text "Hi. Do you have a" line "rail PASS? I have" @@ -237,5 +237,5 @@ SaffronTrainStation_MapEventHeader: db 4 person_event SPRITE_OFFICER, 9, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1 person_event SPRITE_GYM_GUY, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1 - person_event SPRITE_TEACHER, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18a889, EVENT_SAFFRON_TRAIN_STATION_POPULATION - person_event SPRITE_LASS, 10, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x18a88c, EVENT_SAFFRON_TRAIN_STATION_POPULATION + person_event SPRITE_TEACHER, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SaffronTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION + person_event SPRITE_LASS, 10, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SaffronTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index ab6eab65a..dedcf8561 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -12,10 +12,10 @@ SilverCavePokecenter1F_MapScriptHeader: NurseScript_0x1ae59a: jumpstd pokecenternurse -GrannyScript_0x1ae59d: - jumptextfaceplayer UnknownText_0x1ae5a0 +SilverCavePokecenter1FGrannyScript: + jumptextfaceplayer SilverCavePokecenter1FGrannyText -UnknownText_0x1ae5a0: +SilverCavePokecenter1FGrannyText: text "Trainers who seek" line "power climb MT." @@ -48,4 +48,4 @@ SilverCavePokecenter1F_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1 - person_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_STANDING_LEFT, 1, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x1ae59d, -1 + person_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_STANDING_LEFT, 1, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index be5d0eace..e716d3574 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -16,13 +16,13 @@ SlowpokeWellB1F_MapScriptHeader: .MapCallbacks: db 0 -KurtScript_0x5a5d5: - jumptextfaceplayer UnknownText_0x5a6b5 +SlowpokeWellB1FKurtScript: + jumptextfaceplayer SlowpokeWellB1FKurtText TrainerGruntM29: - trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, GruntM29Script + trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, .Script -GruntM29Script: +.Script: end_if_just_battled opentext writetext GruntM29AfterBattleText @@ -31,9 +31,9 @@ GruntM29Script: end TrainerGruntM1: - trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, GruntM1Script + trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, .Script -GruntM1Script: +.Script: opentext writetext TrainerGruntM1WhenTalkText waitbutton @@ -74,9 +74,9 @@ GruntM1Script: end TrainerGruntM2: - trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, GruntM2Script + trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, .Script -GruntM2Script: +.Script: end_if_just_battled opentext writetext GruntM2AfterBattleText @@ -85,9 +85,9 @@ GruntM2Script: end TrainerGruntF1: - trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, GruntF1Script + trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, .Script -GruntF1Script: +.Script: end_if_just_battled opentext writetext GruntF1AfterBattleText @@ -144,7 +144,7 @@ KurtSlowpokeWellVictoryMovementData: turn_head LEFT step_end -UnknownText_0x5a6b5: +SlowpokeWellB1FKurtText: text "KURT: Hey there," line "!" @@ -343,6 +343,6 @@ SlowpokeWellB1F_MapEventHeader: person_event SPRITE_ROCKET_GIRL, 4, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS person_event SPRITE_SLOWPOKE, 4, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x5a681, EVENT_SLOWPOKE_WELL_SLOWPOKES person_event SPRITE_SLOWPOKE, 2, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES - person_event SPRITE_KURT, 14, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtScript_0x5a5d5, EVENT_SLOWPOKE_WELL_KURT + person_event SPRITE_KURT, 14, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeWellB1FKurtScript, EVENT_SLOWPOKE_WELL_KURT person_event SPRITE_BOULDER, 2, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1 person_event SPRITE_POKE_BALL, 3, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 9b77f4306..ba46065a3 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -14,14 +14,14 @@ SoulHouse_MapScriptHeader: MrFuji: jumptextfaceplayer MrFujiText -TeacherScript_0x7ec4a: - jumptextfaceplayer UnknownText_0x7ed4d +SoulHouseTeacherScript: + jumptextfaceplayer SoulHouseTeacherText -LassScript_0x7ec4d: - jumptextfaceplayer UnknownText_0x7edb1 +SoulHouseLassScript: + jumptextfaceplayer SoulHouseLassText -GrannyScript_0x7ec50: - jumptextfaceplayer UnknownText_0x7eddb +SoulHouseGrannyScript: + jumptextfaceplayer SoulHouseGrannyText MrFujiText: text "MR.FUJI: Welcome." @@ -48,7 +48,7 @@ MrFujiText: line "make them happy." done -UnknownText_0x7ed4d: +SoulHouseTeacherText: text "There are other" line "graves of #MON" cont "here, I think." @@ -58,13 +58,13 @@ UnknownText_0x7ed4d: cont "MR.FUJI may enter." done -UnknownText_0x7edb1: +SoulHouseLassText: text "I came with my mom" line "to visit #MON" cont "graves…" done -UnknownText_0x7eddb: +SoulHouseGrannyText: text "The #MON that" line "lived with me…" @@ -90,6 +90,6 @@ SoulHouse_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_GRAMPS, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, MrFuji, -1 - person_event SPRITE_TEACHER, 3, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7ec4a, -1 - person_event SPRITE_LASS, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x7ec4d, -1 - person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrannyScript_0x7ec50, -1 + person_event SPRITE_TEACHER, 3, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1 + person_event SPRITE_LASS, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SoulHouseLassScript, -1 + person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 5287ef850..782031e97 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -13,22 +13,22 @@ SproutTower1F_MapScriptHeader: .MapCallbacks: db 0 -SageScript_0x1844fe: - jumptextfaceplayer UnknownText_0x1845d8 +SproutTower1FSage1Script: + jumptextfaceplayer SproutTower1FSage1Text -SageScript_0x184501: - jumptextfaceplayer UnknownText_0x18460a +SproutTower1FSage2Script: + jumptextfaceplayer SproutTower1FSage2Text -GrannyScript_0x184504: - jumptextfaceplayer UnknownText_0x184649 +SproutTower1FGrannyScript: + jumptextfaceplayer SproutTower1FGrannyText -TeacherScript_0x184507: - jumptextfaceplayer UnknownText_0x18469d +SproutTower1FTeacherScript: + jumptextfaceplayer SproutTower1FTeacherText TrainerSageChow: - trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, 0, SageChowScript + trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, 0, .Script -SageChowScript: +.Script: end_if_just_battled opentext writetext SageChowAfterBattleText @@ -64,13 +64,13 @@ SageChowAfterBattleText: line "thankful for this." done -UnknownText_0x1845d8: +SproutTower1FSage1Text: text "Only if you reach" line "the top will you" cont "obtain an HM." done -UnknownText_0x18460a: +SproutTower1FSage2Text: text "SPROUT TOWER was" line "built long ago" @@ -78,7 +78,7 @@ UnknownText_0x18460a: line "#MON training." done -UnknownText_0x184649: +SproutTower1FGrannyText: text "A BELLSPROUT over" line "100 feet tall…" @@ -87,7 +87,7 @@ UnknownText_0x184649: cont "pillar here." done -UnknownText_0x18469d: +SproutTower1FTeacherText: text "See the pillar" line "shaking?" @@ -124,9 +124,9 @@ SproutTower1F_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_SAGE, 4, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SageScript_0x1844fe, -1 - person_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SageScript_0x184501, -1 - person_event SPRITE_GRANNY, 12, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x184504, -1 - person_event SPRITE_TEACHER, 9, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x184507, -1 + person_event SPRITE_SAGE, 4, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1 + person_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1 + person_event SPRITE_GRANNY, 12, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1 + person_event SPRITE_TEACHER, 9, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1 person_event SPRITE_SAGE, 5, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageChow, -1 person_event SPRITE_POKE_BALL, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 1833c1372..acd62a2cb 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -11,9 +11,9 @@ SproutTower2F_MapScriptHeader: db 0 TrainerSageNico: - trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, 0, SageNicoScript + trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script -SageNicoScript: +.Script: end_if_just_battled opentext writetext SageNicoAfterBattleText @@ -22,9 +22,9 @@ SageNicoScript: end TrainerSageEdmond: - trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, SageEdmondScript + trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, .Script -SageEdmondScript: +.Script: end_if_just_battled opentext writetext SageEdmondAfterBattleText diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 71188ee59..c882ac18e 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -93,9 +93,9 @@ UnknownScript_0x1849d1: end TrainerSageJin: - trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, SageJinScript + trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, .Script -SageJinScript: +.Script: end_if_just_battled opentext writetext SageJinAfterBattleText @@ -104,9 +104,9 @@ SageJinScript: end TrainerSageTroy: - trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, SageTroyScript + trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, .Script -SageTroyScript: +.Script: end_if_just_battled opentext writetext SageTroyAfterBattleText @@ -115,9 +115,9 @@ SageTroyScript: end TrainerSageNeal: - trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, SageNealScript + trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, .Script -SageNealScript: +.Script: end_if_just_battled opentext writetext SageNealAfterBattleText diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 390ea5d7a..34781a23c 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -481,9 +481,9 @@ NoExplodingTrap: end TrainerScientistJed: - trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, 0, ScientistJedScript + trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, 0, .Script -ScientistJedScript: +.Script: end_if_just_battled opentext writetext ScientistJedAfterBattleText @@ -492,9 +492,9 @@ ScientistJedScript: end TrainerGruntM16: - trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, GruntM16Script + trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, .Script -GruntM16Script: +.Script: end_if_just_battled opentext writetext GruntM16AfterBattleText diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 9223be138..84f1a3148 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -189,9 +189,9 @@ UnknownScript_0x6d0be: end TrainerGruntM17: - trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, GruntM17Script + trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, .Script -GruntM17Script: +.Script: end_if_just_battled opentext writetext GruntM17AfterBattleText @@ -200,9 +200,9 @@ GruntM17Script: end TrainerGruntM18: - trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, GruntM18Script + trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, .Script -GruntM18Script: +.Script: end_if_just_battled opentext writetext GruntM18AfterBattleText @@ -211,9 +211,9 @@ GruntM18Script: end TrainerGruntM19: - trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, GruntM19Script + trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, .Script -GruntM19Script: +.Script: end_if_just_battled opentext writetext GruntM19AfterBattleText diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 916e7dd9d..905cdad4d 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -83,8 +83,8 @@ RocketBaseRival: special RestartMapMusic end -RocketScript_0x6e048: - jumptextfaceplayer UnknownText_0x6e235 +TeamRocketBaseB3FRocketScript: + jumptextfaceplayer TeamRocketBaseB3FRocketText UnknownScript_0x6e04b: applymovement PLAYER, MovementData_0x6e133 @@ -152,9 +152,9 @@ GruntM28Script: end TrainerScientistRoss: - trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, ScientistRossScript + trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, .Script -ScientistRossScript: +.Script: end_if_just_battled opentext writetext ScientistRossAfterBattleText @@ -163,9 +163,9 @@ ScientistRossScript: end TrainerScientistMitch: - trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, ScientistMitchScript + trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, .Script -ScientistMitchScript: +.Script: end_if_just_battled opentext writetext ScientistMitchAfterBattleText @@ -337,7 +337,7 @@ LanceGetPasswordText: line "get the passwords." done -UnknownText_0x6e235: +TeamRocketBaseB3FRocketText: text "Urrggh… The guy" line "in the cape is" cont "incredibly tough…" @@ -604,7 +604,7 @@ TeamRocketBaseB3F_MapEventHeader: person_event SPRITE_ROCKET, 14, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_SCIENTIST, 11, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_ROCKET, 14, 24, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x6e048, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET, 14, 24, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeamRocketBaseB3FRocketScript, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_SILVER, 5, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN person_event SPRITE_POKE_BALL, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 73b5f3554..87fbfe13e 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -169,31 +169,31 @@ TinTower1F_MapScriptHeader: playmapmusic end -SageScript_0x185173: - jumptextfaceplayer UnknownText_0x185386 +TinTower1FSage1Script: + jumptextfaceplayer TinTower1FSage1Text -SageScript_0x185176: - jumptextfaceplayer UnknownText_0x185433 +TinTower1FSage2Script: + jumptextfaceplayer TinTower1FSage2Text -SageScript_0x185179: - jumptextfaceplayer UnknownText_0x185544 +TinTower1FSage3Script: + jumptextfaceplayer TinTower1FSage3Text -SageScript_0x18517c: +TinTower1FSage4Script: checkevent EVENT_FOUGHT_HO_OH - iftrue UnknownScript_0x185185 - jumptextfaceplayer UnknownText_0x1855ee + iftrue .FoughtHoOh + jumptextfaceplayer TinTower1FSage4Text1 -UnknownScript_0x185185: - jumptextfaceplayer UnknownText_0x185765 +.FoughtHoOh: + jumptextfaceplayer TinTower1FSage4Text2 -SageScript_0x185188: +TinTower1FSage5Script: faceplayer opentext checkevent EVENT_FOUGHT_HO_OH - iftrue UnknownScript_0x1851b6 + iftrue .FoughtHoOh checkevent EVENT_GOT_RAINBOW_WING - iftrue UnknownScript_0x1851b0 - writetext UnknownText_0x185629 + iftrue .GotRainbowWing + writetext TinTower1FSage5Text1 buttonsound verbosegiveitem RAINBOW_WING closetext @@ -206,25 +206,25 @@ SageScript_0x185188: setevent EVENT_GOT_RAINBOW_WING closetext opentext -UnknownScript_0x1851b0: - writetext UnknownText_0x18564a +.GotRainbowWing: + writetext TinTower1FSage5Text2 waitbutton closetext end -UnknownScript_0x1851b6: - writetext UnknownText_0x185803 +.FoughtHoOh: + writetext TinTower1FSage5Text3 waitbutton closetext end -SageScript_0x1851bc: +TinTower1FSage6Script: checkevent EVENT_FOUGHT_HO_OH - iftrue UnknownScript_0x1851c5 - jumptextfaceplayer UnknownText_0x185654 + iftrue .FoughtHoOh + jumptextfaceplayer TinTower1FSage6Text1 -UnknownScript_0x1851c5: - jumptextfaceplayer UnknownText_0x1858d0 +.FoughtHoOh: + jumptextfaceplayer TinTower1FSage6Text2 TinTowerEusine: jumptextfaceplayer TinTowerEusineHoOhText @@ -347,7 +347,7 @@ TinTowerEusineSuicuneText: para "Later, !" done -UnknownText_0x185386: +TinTower1FSage1Text: text "According to" line "legend…" @@ -367,7 +367,7 @@ UnknownText_0x185386: line "humans?" done -UnknownText_0x185433: +TinTower1FSage2Text: text "When the BRASS" line "TOWER burned down," @@ -399,7 +399,7 @@ UnknownText_0x185433: line "say." done -UnknownText_0x185544: +TinTower1FSage3Text: text "The two TOWERS are" line "said to have been" @@ -416,7 +416,7 @@ UnknownText_0x185544: line "important today." done -UnknownText_0x1855ee: +TinTower1FSage4Text1: text "HO-OH appears to" line "have descended" @@ -424,16 +424,16 @@ UnknownText_0x1855ee: line "TOWER!" done -UnknownText_0x185629: +TinTower1FSage5Text1: text "This will protect" line "you. Take it." done -UnknownText_0x18564a: +TinTower1FSage5Text2: text "Now, go." done -UnknownText_0x185654: +TinTower1FSage6Text1: text "I believe you are" line "being tested." @@ -464,7 +464,7 @@ TinTowerEusineHoOhText: line "#MANIAC!" done -UnknownText_0x185765: +TinTower1FSage4Text2: text "The legendary" line "#MON are said" @@ -481,7 +481,7 @@ UnknownText_0x185765: line "put out the fire…" done -UnknownText_0x185803: +TinTower1FSage5Text3: text "When the legendary" line "#MON appeared…" @@ -502,7 +502,7 @@ UnknownText_0x185803: cont "frightened people." done -UnknownText_0x1858d0: +TinTower1FSage6Text2: text "Of the legendary" line "#MON, SUICUNE" @@ -544,9 +544,9 @@ TinTower1F_MapEventHeader: person_event SPRITE_RAIKOU, 9, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU person_event SPRITE_ENTEI, 9, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI person_event SPRITE_SUPER_NERD, 3, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE - person_event SPRITE_SAGE, 9, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185173, EVENT_TIN_TOWER_1F_WISE_TRIO_1 - person_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185176, EVENT_TIN_TOWER_1F_WISE_TRIO_1 - person_event SPRITE_SAGE, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185179, EVENT_TIN_TOWER_1F_WISE_TRIO_1 - person_event SPRITE_SAGE, 2, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x18517c, EVENT_TIN_TOWER_1F_WISE_TRIO_2 - person_event SPRITE_SAGE, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185188, EVENT_TIN_TOWER_1F_WISE_TRIO_2 - person_event SPRITE_SAGE, 2, 14, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x1851bc, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + person_event SPRITE_SAGE, 9, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + person_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage2Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + person_event SPRITE_SAGE, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + person_event SPRITE_SAGE, 2, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage4Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + person_event SPRITE_SAGE, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage5Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + person_event SPRITE_SAGE, 2, 14, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage6Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 728a94147..14a458528 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -11,11 +11,13 @@ TinTower9F_MapScriptHeader: TinTower9FHPUp: itemball HP_UP -UnknownText_0x185b8a: +; unused +TinTower9FUnusedHoOhText: text "HO-OH: Shaoooh!" done -UnknownText_0x185b9b: +; unused +TinTower9FUnusedLugiaText: text "LUGIA: Gyaaan!" done diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index 98b0960f1..87fd7b592 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -12,20 +12,20 @@ TrainerHouse1F_MapScriptHeader: .MapCallbacks: db 0 -ReceptionistScript_0x9af67: - jumptextfaceplayer UnknownText_0x9af7f +TrainerHouse1FReceptionistScript: + jumptextfaceplayer TrainerHouse1FReceptionistText -CooltrainerMScript_0x9af6a: - jumptextfaceplayer UnknownText_0x9b025 +TrainerHouse1FCooltrainerMScript: + jumptextfaceplayer TrainerHouse1FCooltrainerMText -CooltrainerFScript_0x9af6d: - jumptextfaceplayer UnknownText_0x9b0b5 +TrainerHouse1FCooltrainerFScript: + jumptextfaceplayer TrainerHouse1FCooltrainerFText -YoungsterScript_0x9af70: - jumptextfaceplayer UnknownText_0x9b11d +TrainerHouse1FYoungsterScript: + jumptextfaceplayer TrainerHouse1FYoungsterText -GentlemanScript_0x9af73: - jumptextfaceplayer UnknownText_0x9b1c9 +TrainerHouse1FGentlemanScript: + jumptextfaceplayer TrainerHouse1FGentlemanText MapTrainerHouse1FSignpost0Script: jumptext UnknownText_0x9b1f4 @@ -36,7 +36,7 @@ MapTrainerHouse1FSignpost1Script: MapTrainerHouse1FSignpost2Script: jumptext UnknownText_0x9b2c1 -UnknownText_0x9af7f: +TrainerHouse1FReceptionistText: text "Welcome to TRAINER" line "HOUSE, the newest" @@ -53,7 +53,7 @@ UnknownText_0x9af7f: line "downstairs." done -UnknownText_0x9b025: +TrainerHouse1FCooltrainerMText: text "VIRIDIAN is the" line "town closest to" cont "INDIGO PLATEAU." @@ -68,7 +68,7 @@ UnknownText_0x9b025: line "PLATEAU." done -UnknownText_0x9b0b5: +TrainerHouse1FCooltrainerFText: text "They hold practice" line "battles downstairs" cont "here." @@ -80,7 +80,7 @@ UnknownText_0x9b0b5: line "battles." done -UnknownText_0x9b11d: +TrainerHouse1FYoungsterText: text "I guess you can't" line "become the CHAMP" @@ -97,7 +97,7 @@ UnknownText_0x9b11d: line "towns in KANTO." done -UnknownText_0x9b1c9: +TrainerHouse1FGentlemanText: text "Whew… I'm taking a" line "rest from #MON" cont "battles." @@ -158,8 +158,8 @@ TrainerHouse1F_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_RECEPTIONIST, 11, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x9af67, -1 - person_event SPRITE_COOLTRAINER_M, 11, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9af6a, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9af6d, -1 - person_event SPRITE_YOUNGSTER, 8, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x9af70, -1 - person_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x9af73, -1 + person_event SPRITE_RECEPTIONIST, 11, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1 + person_event SPRITE_COOLTRAINER_M, 11, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1 + person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1 + person_event SPRITE_YOUNGSTER, 8, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TrainerHouse1FYoungsterScript, -1 + person_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TrainerHouse1FGentlemanScript, -1 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index f060fbf1a..abfbb0f72 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -206,9 +206,9 @@ UndergroundSilverBattleScript: end TrainerGruntM11: - trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, GruntM11Script + trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, .Script -GruntM11Script: +.Script: end_if_just_battled opentext writetext GruntM11AfterBattleText @@ -217,9 +217,9 @@ GruntM11Script: end TrainerGruntM25: - trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, GruntM25Script + trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, .Script -GruntM25Script: +.Script: end_if_just_battled opentext writetext GruntM25AfterBattleText @@ -228,9 +228,9 @@ GruntM25Script: end TrainerBurglarDuncan: - trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, BurglarDuncanScript + trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, .Script -BurglarDuncanScript: +.Script: end_if_just_battled opentext writetext BurglarDuncanAfterBattleText @@ -239,9 +239,9 @@ BurglarDuncanScript: end TrainerBurglarEddie: - trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, BurglarEddieScript + trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, .Script -BurglarEddieScript: +.Script: end_if_just_battled opentext writetext BurglarEddieAfterBattleText @@ -250,9 +250,9 @@ BurglarEddieScript: end TrainerGruntM13: - trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, GruntM13Script + trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, .Script -GruntM13Script: +.Script: end_if_just_battled opentext writetext GruntM13AfterBattleText @@ -261,9 +261,9 @@ GruntM13Script: end TrainerGruntF3: - trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, GruntF3Script + trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, .Script -GruntF3Script: +.Script: end_if_just_battled opentext writetext GruntF3AfterBattleText diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 67f5632ca..7876d0557 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -36,9 +36,9 @@ UndergroundWarehouse_MapScriptHeader: return TrainerGruntM24: - trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, GruntM24Script + trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script -GruntM24Script: +.Script: end_if_just_battled opentext writetext GruntM24AfterBattleText @@ -47,9 +47,9 @@ GruntM24Script: end TrainerGruntM14: - trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, GruntM14Script + trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, .Script -GruntM14Script: +.Script: end_if_just_battled opentext writetext GruntM14AfterBattleText @@ -58,9 +58,9 @@ GruntM14Script: end TrainerGruntM15: - trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, GruntM15Script + trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, .Script -GruntM15Script: +.Script: end_if_just_battled opentext writetext GruntM15AfterBattleText diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index fbcaa23e9..0879a120c 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -17,9 +17,9 @@ UnionCave1F_MapScriptHeader: db 0 TrainerPokemaniacLarry: - trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, PokemaniacLarryScript + trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script -PokemaniacLarryScript: +.Script: end_if_just_battled opentext writetext PokemaniacLarryAfterBattleText @@ -28,9 +28,9 @@ PokemaniacLarryScript: end TrainerHikerRussell: - trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, HikerRussellScript + trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, .Script -HikerRussellScript: +.Script: end_if_just_battled opentext writetext HikerRussellAfterBattleText @@ -39,9 +39,9 @@ HikerRussellScript: end TrainerHikerDaniel: - trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, HikerDanielScript + trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, .Script -HikerDanielScript: +.Script: end_if_just_battled opentext writetext HikerDanielAfterBattleText @@ -50,9 +50,9 @@ HikerDanielScript: end TrainerFirebreatherBill: - trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, FirebreatherBillScript + trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, .Script -FirebreatherBillScript: +.Script: end_if_just_battled opentext writetext FirebreatherBillAfterBattleText @@ -61,9 +61,9 @@ FirebreatherBillScript: end TrainerFirebreatherRay: - trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, FirebreatherRayScript + trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, .Script -FirebreatherRayScript: +.Script: end_if_just_battled opentext writetext FirebreatherRayAfterBattleText diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 1608b6884..a11702651 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -15,9 +15,9 @@ UnionCaveB1F_MapScriptHeader: db 0 TrainerPokemaniacAndrew: - trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, PokemaniacAndrewScript + trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script -PokemaniacAndrewScript: +.Script: end_if_just_battled opentext writetext PokemaniacAndrewAfterBattleText @@ -26,9 +26,9 @@ PokemaniacAndrewScript: end TrainerPokemaniacCalvin: - trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, PokemaniacCalvinScript + trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, .Script -PokemaniacCalvinScript: +.Script: end_if_just_battled opentext writetext PokemaniacCalvinAfterBattleText @@ -37,9 +37,9 @@ PokemaniacCalvinScript: end TrainerHikerPhillip: - trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, HikerPhillipScript + trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, .Script -HikerPhillipScript: +.Script: end_if_just_battled opentext writetext HikerPhillipAfterBattleText @@ -48,9 +48,9 @@ HikerPhillipScript: end TrainerHikerLeonard: - trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, HikerLeonardScript + trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, .Script -HikerLeonardScript: +.Script: end_if_just_battled opentext writetext HikerLeonardAfterBattleText diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 55c5fde36..6ad0ff78e 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -38,9 +38,9 @@ UnionCaveLapras: end TrainerCooltrainermNick: - trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, CooltrainermNickScript + trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, .Script -CooltrainermNickScript: +.Script: end_if_just_battled opentext writetext CooltrainermNickAfterBattleText @@ -49,9 +49,9 @@ CooltrainermNickScript: end TrainerCooltrainerfGwen: - trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, CooltrainerfGwenScript + trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, .Script -CooltrainerfGwenScript: +.Script: end_if_just_battled opentext writetext CooltrainerfGwenAfterBattleText @@ -60,9 +60,9 @@ CooltrainerfGwenScript: end TrainerCooltrainerfEmma: - trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, CooltrainerfEmmaScript + trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, .Script -CooltrainerfEmmaScript: +.Script: end_if_just_battled opentext writetext CooltrainerfEmmaAfterBattleText diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index ea794dd6a..405f450b3 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -18,8 +18,8 @@ VermilionCity_MapScriptHeader: setflag ENGINE_FLYPOINT_VERMILION return -TeacherScript_0x1aa983: - jumptextfaceplayer UnknownText_0x1aaa15 +VermilionCityTeacherScript: + jumptextfaceplayer VermilionCityTeacherText VermilionMachopOwner: jumptextfaceplayer VermilionMachopOwnerText @@ -37,8 +37,8 @@ VermilionMachop: closetext end -SuperNerdScript_0x1aa99b: - jumptextfaceplayer UnknownText_0x1aab1a +VermilionCitySuperNerdScript: + jumptextfaceplayer VermilionCitySuperNerdText VermilionSnorlax: opentext @@ -125,7 +125,7 @@ VermilionCityMartSign: VermilionCityHiddenFullHeal: dwb EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL -UnknownText_0x1aaa15: +VermilionCityTeacherText: text "VERMILION PORT is" line "KANTO's seaside" cont "gateway." @@ -156,7 +156,7 @@ VermilionMachopText2: cont "the ground flat." done -UnknownText_0x1aab1a: +VermilionCitySuperNerdText: text "There are eight" line "GYMS in KANTO." @@ -300,9 +300,9 @@ VermilionCity_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_TEACHER, 9, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1aa983, -1 + person_event SPRITE_TEACHER, 9, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1 person_event SPRITE_GRAMPS, 6, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionMachopOwner, -1 person_event SPRITE_MACHOP, 7, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, VermilionMachop, -1 - person_event SPRITE_SUPER_NERD, 16, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1aa99b, -1 + person_event SPRITE_SUPER_NERD, 16, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VermilionCitySuperNerdScript, -1 person_event SPRITE_BIG_SNORLAX, 8, 34, SPRITEMOVEDATA_SNORLAX, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX person_event SPRITE_POKEFAN_M, 12, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index f5cf8e96a..e98ebb848 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -45,9 +45,9 @@ SurgeScript_0x1920a5: end TrainerGentlemanGregory: - trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, GentlemanGregoryScript + trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, .Script -GentlemanGregoryScript: +.Script: end_if_just_battled opentext writetext GentlemanGregoryAfterBattleText @@ -56,9 +56,9 @@ GentlemanGregoryScript: end TrainerGuitaristVincent: - trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, GuitaristVincentScript + trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, .Script -GuitaristVincentScript: +.Script: end_if_just_battled opentext writetext GuitaristVincentAfterBattleText @@ -67,9 +67,9 @@ GuitaristVincentScript: end TrainerJugglerHorton: - trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, JugglerHortonScript + trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, .Script -JugglerHortonScript: +.Script: end_if_just_battled opentext writetext JugglerHortonAfterBattleText diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index 53360680c..b7440fcd7 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -8,10 +8,10 @@ VermilionHouseDiglettsCaveSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -GentlemanScript_0x192031: - jumptextfaceplayer UnknownText_0x192034 +VermilionHouseDiglettsCaveSpeechHouseGentlemanScript: + jumptextfaceplayer VermilionHouseDiglettsCaveSpeechHouseGentlemanText -UnknownText_0x192034: +VermilionHouseDiglettsCaveSpeechHouseGentlemanText: text "Over many years," line "DIGLETT dug a" cont "large tunnel." @@ -37,4 +37,4 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_GENTLEMAN, 3, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x192031, -1 + person_event SPRITE_GENTLEMAN, 3, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VermilionHouseDiglettsCaveSpeechHouseGentlemanScript, -1 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index 763f89755..1d94b09a9 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -9,16 +9,16 @@ VermilionMagnetTrainSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -PokefanFScript_0x191eb7: - jumptextfaceplayer UnknownText_0x191ec0 +VermilionMagnetTrainSpeechHousePokefanFScript: + jumptextfaceplayer VermilionMagnetTrainSpeechHousePokefanFText -YoungsterScript_0x191eba: - jumptextfaceplayer UnknownText_0x191f16 +VermilionMagnetTrainSpeechHouseYoungsterScript: + jumptextfaceplayer VermilionMagnetTrainSpeechHouseYoungsterText VermilionMagnetTrainSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x191ec0: +VermilionMagnetTrainSpeechHousePokefanFText: text "Do you know about" line "the MAGNET TRAIN?" @@ -27,7 +27,7 @@ UnknownText_0x191ec0: cont "DENROD in JOHTO." done -UnknownText_0x191f16: +VermilionMagnetTrainSpeechHouseYoungsterText: text "I want to go to" line "SAFFRON to see" cont "the MAGNET TRAIN." @@ -52,5 +52,5 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x191eb7, -1 - person_event SPRITE_YOUNGSTER, 3, 0, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x191eba, -1 + person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1 + person_event SPRITE_YOUNGSTER, 3, 0, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index e5092c8ca..71a7d601f 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -16,13 +16,13 @@ ClerkScript_0x191f7e: closetext end -SuperNerdScript_0x191f85: - jumptextfaceplayer UnknownText_0x191f8b +VermilionMartSuperNerdScript: + jumptextfaceplayer VermilionMartSuperNerdText -BuenaScript_0x191f88: - jumptextfaceplayer UnknownText_0x191fca +VermilionMartBuenaScript: + jumptextfaceplayer VermilionMartBuenaText -UnknownText_0x191f8b: +VermilionMartSuperNerdText: text "TEAM ROCKET is no" line "longer in KANTO." @@ -30,7 +30,7 @@ UnknownText_0x191f8b: line "me happy." done -UnknownText_0x191fca: +VermilionMartBuenaText: text "I'm thinking about" line "going shopping in" cont "SAFFRON." @@ -54,5 +54,5 @@ VermilionMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1 - person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x191f85, -1 - person_event SPRITE_BUENA, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BuenaScript_0x191f88, -1 + person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1 + person_event SPRITE_BUENA, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1 diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index f4bbd0140..1a6e6b905 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -30,11 +30,11 @@ UnknownScript_0x191614: closetext end -SailorScript_0x19161a: - jumptextfaceplayer UnknownText_0x1916fe +VermilionPokecenter1FSailorScript: + jumptextfaceplayer VermilionPokecenter1FSailorText -BugCatcherScript_0x19161d: - jumptextfaceplayer UnknownText_0x19173b +VermilionPokecenter1FBugCatcherScript: + jumptextfaceplayer VermilionPokecenter1FBugCatcherText UnknownText_0x191620: text "A sleeping #MON" @@ -59,7 +59,7 @@ UnknownText_0x191698: line "have disappeared." done -UnknownText_0x1916fe: +VermilionPokecenter1FSailorText: text "The FAST SHIP is a" line "great place to" @@ -67,7 +67,7 @@ UnknownText_0x1916fe: line "trainers." done -UnknownText_0x19173b: +VermilionPokecenter1FBugCatcherText: text "Oh? You have some" line "BADGES I've never" cont "seen before." @@ -96,5 +96,5 @@ VermilionPokecenter1F_MapEventHeader: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x191603, -1 person_event SPRITE_FISHING_GURU, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1 - person_event SPRITE_SAILOR, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x19161a, -1 - person_event SPRITE_BUG_CATCHER, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x19161d, -1 + person_event SPRITE_SAILOR, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1 + person_event SPRITE_BUG_CATCHER, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 8acb74505..028bb6094 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -8,10 +8,10 @@ VermilionPortPassage_MapScriptHeader: .MapCallbacks: db 0 -TeacherScript_0x7701a: - jumptextfaceplayer UnknownText_0x7701d +VermilionPortPassageTeacherScript: + jumptextfaceplayer VermilionPortPassageTeacherText -UnknownText_0x7701d: +VermilionPortPassageTeacherText: text "The FAST SHIP" line "sails on Wednes-" cont "days and Sundays" @@ -38,4 +38,4 @@ VermilionPortPassage_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_TEACHER, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7701a, -1 + person_event SPRITE_TEACHER, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 2d503853b..93a71312a 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -289,7 +289,7 @@ VioletCity_MapEventHeader: warp_def $11, $1e, 1, EARLS_POKEMON_ACADEMY warp_def $f, $3, 1, VIOLET_NICKNAME_SPEECH_HOUSE warp_def $19, $1f, 1, VIOLET_POKECENTER_1F - warp_def $1d, $15, 1, VIOLET_ONIX_TRADE_HOUSE + warp_def $1d, $15, 1, VIOLET_KYLES_HOUSE warp_def $5, $17, 1, SPROUT_TOWER_1F warp_def $18, $27, 1, ROUTE_31_VIOLET_GATE warp_def $19, $27, 2, ROUTE_31_VIOLET_GATE diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index a1f6beeb7..b98a789a5 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -67,9 +67,9 @@ VioletGymTriggerRockets: jumpstd radiotowerrockets TrainerBird_keeperRod: - trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, 0, Bird_keeperRodScript + trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, 0, .Script -Bird_keeperRodScript: +.Script: end_if_just_battled opentext writetext Bird_keeperRodAfterBattleText @@ -78,9 +78,9 @@ Bird_keeperRodScript: end TrainerBird_keeperAbe: - trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, 0, Bird_keeperAbeScript + trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, 0, .Script -Bird_keeperAbeScript: +.Script: end_if_just_battled opentext writetext Bird_keeperAbeAfterBattleText diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletKylesHouse.asm similarity index 67% rename from maps/VioletOnixTradeHouse.asm rename to maps/VioletKylesHouse.asm index feb5b10af..de6a1edf8 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -1,16 +1,16 @@ const_value set 2 - const VIOLETONIXTRADEHOUSE_POKEFAN_M - const VIOLETONIXTRADEHOUSE_KYLE + const VIOLETKYLESHOUSE_POKEFAN_M + const VIOLETKYLESHOUSE_KYLE -VioletOnixTradeHouse_MapScriptHeader: +VioletKylesHouse_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -PokefanMScript_0x6998d: - jumptextfaceplayer UnknownText_0x69997 +VioletKylesHousePokefanMScript: + jumptextfaceplayer VioletKylesHousePokefanMText Kyle: faceplayer @@ -20,7 +20,7 @@ Kyle: closetext end -UnknownText_0x69997: +VioletKylesHousePokefanMText: text "A #MON you get" line "in a trade grows" cont "quickly." @@ -32,7 +32,7 @@ UnknownText_0x69997: line "disobey you." done -VioletOnixTradeHouse_MapEventHeader: +VioletKylesHouse_MapEventHeader: ; filler db 0, 0 @@ -49,5 +49,5 @@ VioletOnixTradeHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x6998d, -1 + person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1 person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Kyle, -1 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index 35b0d5593..db6790bfe 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -16,13 +16,13 @@ ClerkScript_0x68295: closetext end -GrannyScript_0x6829c: - jumptextfaceplayer UnknownText_0x682a2 +VioletMartGrannyScript: + jumptextfaceplayer VioletMartGrannyText -CooltrainerMScript_0x6829f: - jumptextfaceplayer UnknownText_0x68323 +VioletMartCooltrainerMScript: + jumptextfaceplayer VioletMartCooltrainerMText -UnknownText_0x682a2: +VioletMartGrannyText: text "When you first" line "catch a #MON," cont "it may be weak." @@ -36,7 +36,7 @@ UnknownText_0x682a2: cont "love." done -UnknownText_0x68323: +VioletMartCooltrainerMText: text "#MON can hold" line "items like POTION" cont "and ANTIDOTE." @@ -66,5 +66,5 @@ VioletMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x68295, -1 - person_event SPRITE_GRANNY, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x6829c, -1 - person_event SPRITE_COOLTRAINER_M, 2, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x6829f, -1 + person_event SPRITE_GRANNY, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletMartGrannyScript, -1 + person_event SPRITE_COOLTRAINER_M, 2, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index e10c41d0a..61f95bb0b 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -10,11 +10,11 @@ VioletNicknameSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -TeacherScript_0x693e9: - jumptextfaceplayer UnknownText_0x693fa +VioletNicknameSpeechHouseTeacherScript: + jumptextfaceplayer VioletNicknameSpeechHouseTeacherText -LassScript_0x693ec: - jumptextfaceplayer UnknownText_0x6945e +VioletNicknameSpeechHouseLassScript: + jumptextfaceplayer VioletNicknameSpeechHouseLassText BirdScript_0x693ef: faceplayer @@ -25,7 +25,7 @@ BirdScript_0x693ef: closetext end -UnknownText_0x693fa: +VioletNicknameSpeechHouseTeacherText: text "She uses the names" line "of her favorite" cont "things to eat." @@ -35,7 +35,7 @@ UnknownText_0x693fa: cont "#MON, I mean." done -UnknownText_0x6945e: +VioletNicknameSpeechHouseLassText: text "I call my PIDGEY" line "STRAWBERRY!" done @@ -61,6 +61,6 @@ VioletNicknameSpeechHouse_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x693e9, -1 - person_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x693ec, -1 + person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1 + person_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1 person_event SPRITE_BIRD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BirdScript_0x693ef, -1 diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 46afff49a..f871a5977 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -78,14 +78,14 @@ VioletPokecenter1F_ElmsAideScript: writetext UnknownText_0x69712 jump .AskTakeEgg -GameboyKidScript_0x69540: - jumptextfaceplayer UnknownText_0x69809 +VioletPokecenter1FGameboyKidScript: + jumptextfaceplayer VioletPokecenter1FGameboyKidText -GentlemanScript_0x69543: - jumptextfaceplayer UnknownText_0x6983c +VioletPokecenter1FGentlemanScript: + jumptextfaceplayer VioletPokecenter1FGentlemanText -YoungsterScript_0x69546: - jumptextfaceplayer UnknownText_0x698b8 +VioletPokecenter1FYoungsterScript: + jumptextfaceplayer VioletPokecenter1FYoungsterText MovementData_AideWalksStraightOutOfPokecenter: step DOWN @@ -182,13 +182,13 @@ UnknownText_0x69791: line "a friend far away." done -UnknownText_0x69809: +VioletPokecenter1FGameboyKidText: text "A guy named BILL" line "made the #MON" cont "PC storage system." done -UnknownText_0x6983c: +VioletPokecenter1FGentlemanText: text "It was around" line "three years ago." @@ -201,7 +201,7 @@ UnknownText_0x6983c: cont "kid broke 'em up." done -UnknownText_0x698b8: +VioletPokecenter1FYoungsterText: text "#MON are smart." line "They won't obey a" @@ -234,7 +234,7 @@ VioletPokecenter1F_MapEventHeader: .PersonEvents: db 5 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletPokecenterNurse, -1 - person_event SPRITE_GAMEBOY_KID, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x69540, -1 - person_event SPRITE_GENTLEMAN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x69543, -1 - person_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x69546, -1 + person_event SPRITE_GAMEBOY_KID, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1 + person_event SPRITE_GENTLEMAN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1 + person_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1 person_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index a6b30627a..3b4ce8f33 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -66,8 +66,8 @@ FisherScript_0x1a9a75: closetext end -YoungsterScript_0x1a9a90: - jumptextfaceplayer UnknownText_0x1a9daa +ViridianCityYoungsterScript: + jumptextfaceplayer ViridianCityYoungsterText ViridianCitySign: jumptext ViridianCitySignText @@ -176,7 +176,7 @@ UnknownText_0x1a9d86: para "…Zzzzz…" done -UnknownText_0x1a9daa: +ViridianCityYoungsterText: text "I heard that there" line "are many items on" @@ -244,4 +244,4 @@ ViridianCity_MapEventHeader: person_event SPRITE_GRAMPS, 5, 18, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9a4c, -1 person_event SPRITE_GRAMPS, 8, 30, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9a61, -1 person_event SPRITE_FISHER, 23, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a9a75, -1 - person_event SPRITE_YOUNGSTER, 21, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a9a90, -1 + person_event SPRITE_YOUNGSTER, 21, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ViridianCityYoungsterScript, -1 diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 25764b0a5..dbb1e8d09 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -16,19 +16,19 @@ ClerkScript_0x9b5e7: closetext end -LassScript_0x9b5ee: - jumptextfaceplayer UnknownText_0x9b5f4 +ViridianMartLassScript: + jumptextfaceplayer ViridianMartLassText -CooltrainerMScript_0x9b5f1: - jumptextfaceplayer UnknownText_0x9b61a +ViridianMartCooltrainerMScript: + jumptextfaceplayer ViridianMartCooltrainerMText -UnknownText_0x9b5f4: +ViridianMartLassText: text "The GYM LEADER" line "here is totally" cont "cool." done -UnknownText_0x9b61a: +ViridianMartCooltrainerMText: text "Have you been to" line "CINNABAR?" @@ -54,5 +54,5 @@ ViridianMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1 - person_event SPRITE_LASS, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x9b5ee, -1 - person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9b5f1, -1 + person_event SPRITE_LASS, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ViridianMartLassScript, -1 + person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index b28c14ac1..9c402b327 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -11,11 +11,11 @@ ViridianNicknameSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -PokefanMScript_0x9ae3a: - jumptextfaceplayer UnknownText_0x9ae54 +ViridianNicknameSpeechHousePokefanMScript: + jumptextfaceplayer ViridianNicknameSpeechHousePokefanMText -LassScript_0x9ae3d: - jumptextfaceplayer UnknownText_0x9aecb +ViridianNicknameSpeechHouseLassScript: + jumptextfaceplayer ViridianNicknameSpeechHouseLassText Speary: opentext @@ -33,7 +33,7 @@ Rattey: closetext end -UnknownText_0x9ae54: +ViridianNicknameSpeechHousePokefanMText: text "Do you put a lot" line "of thought into" @@ -47,7 +47,7 @@ UnknownText_0x9ae54: line "with others." done -UnknownText_0x9aecb: +ViridianNicknameSpeechHouseLassText: text "They're SPEARY--" line "a SPEAROW--and" cont "RATTEY--a RATTATA." @@ -78,7 +78,7 @@ ViridianNicknameSpeechHouse_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_POKEFAN_M, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x9ae3a, -1 - person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x9ae3d, -1 + person_event SPRITE_POKEFAN_M, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1 + person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1 person_event SPRITE_MOLTRES, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, Speary, -1 person_event SPRITE_GROWLITHE, 3, 6, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Rattey, -1 diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index 35c634f03..2db55de00 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -30,11 +30,11 @@ CooltrainerMScript_0x9b693: closetext end -CooltrainerFScript_0x9b6a7: - jumptextfaceplayer UnknownText_0x9b76b +ViridianPokecenter1FCooltrainerFScript: + jumptextfaceplayer ViridianPokecenter1FCooltrainerFText -BugCatcherScript_0x9b6aa: - jumptextfaceplayer UnknownText_0x9b7c8 +ViridianPokecenter1FBugCatcherScript: + jumptextfaceplayer ViridianPokecenter1FBugCatcherText UnknownText_0x9b6ad: text "Where in the world" @@ -56,7 +56,7 @@ UnknownText_0x9b6f5: line "any underlings." done -UnknownText_0x9b76b: +ViridianPokecenter1FCooltrainerFText: text "I heard that the" line "GYM in CINNABAR is" cont "gone." @@ -66,7 +66,7 @@ UnknownText_0x9b76b: cont "the GYM LEADER." done -UnknownText_0x9b7c8: +ViridianPokecenter1FBugCatcherText: text "My dream is to be-" line "come a GYM LEADER." done @@ -91,5 +91,5 @@ ViridianPokecenter1F_MapEventHeader: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x9b690, -1 person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1 - person_event SPRITE_COOLTRAINER_F, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9b6a7, -1 - person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x9b6aa, -1 + person_event SPRITE_COOLTRAINER_F, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1 + person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1 diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 6acaa08b2..9028ccb8f 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -111,9 +111,9 @@ WarehouseEntrance_MapScriptHeader: return TrainerSupernerdEric: - trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, SupernerdEricScript + trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script -SupernerdEricScript: +.Script: end_if_just_battled opentext writetext SupernerdEricAfterBattleText @@ -122,9 +122,9 @@ SupernerdEricScript: end TrainerSupernerdTeru: - trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, SupernerdTeruScript + trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, .Script -SupernerdTeruScript: +.Script: end_if_just_battled opentext writetext SupernerdTeruAfterBattleText @@ -133,9 +133,9 @@ SupernerdTeruScript: end TrainerPokemaniacIssac: - trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, PokemaniacIssacScript + trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, .Script -PokemaniacIssacScript: +.Script: end_if_just_battled opentext writetext PokemaniacIssacAfterBattleText @@ -144,9 +144,9 @@ PokemaniacIssacScript: end TrainerPokemaniacDonald: - trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, PokemaniacDonaldScript + trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, .Script -PokemaniacDonaldScript: +.Script: end_if_just_battled opentext writetext PokemaniacDonaldAfterBattleText diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 5f4a38dad..a14a3d3fb 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -43,14 +43,14 @@ WiseTriosRoom_MapScriptHeader: setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return -SageScript_0x9859a: - jumptextfaceplayer UnknownText_0x9862b +WiseTriosRoomSage1Script: + jumptextfaceplayer WiseTriosRoomSage1Text -SageScript_0x9859d: - jumptextfaceplayer UnknownText_0x9868b +WiseTriosRoomSage2Script: + jumptextfaceplayer WiseTriosRoomSage2Text -SageScript_0x985a0: - jumptextfaceplayer UnknownText_0x987af +WiseTriosRoomSage3Script: + jumptextfaceplayer WiseTriosRoomSage3Text UnknownScript_0x985a3: spriteface WISETRIOSROOM_SAGE3, UP @@ -69,9 +69,9 @@ UnknownScript_0x985a3: end TrainerSageGaku: - trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, 0, SageGakuScript + trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, 0, .Script -SageGakuScript: +.Script: opentext writetext UnknownText_0x98938 waitbutton @@ -79,9 +79,9 @@ SageGakuScript: end TrainerSageMasa: - trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, 0, SageMasaScript + trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, 0, .Script -SageMasaScript: +.Script: opentext writetext UnknownText_0x98a35 waitbutton @@ -89,9 +89,9 @@ SageMasaScript: end TrainerSageKoji: - trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, 0, SageKojiScript + trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, 0, .Script -SageKojiScript: +.Script: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x9861b pause 10 @@ -130,7 +130,7 @@ MovementData_0x98628: step DOWN step_end -UnknownText_0x9862b: +WiseTriosRoomSage1Text: text "Astounding…" para "SUICUNE, ENTEI and" @@ -141,7 +141,7 @@ UnknownText_0x9862b: line "coming true?" done -UnknownText_0x9868b: +WiseTriosRoomSage2Text: text "We train at the" line "BURNED TOWER, but" @@ -172,7 +172,7 @@ UnknownText_0x98712: line "entering!" done -UnknownText_0x987af: +WiseTriosRoomSage3Text: text "We, the WISE TRIO," line "are the protectors" @@ -363,9 +363,9 @@ WiseTriosRoom_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_SAGE, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x9859a, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - person_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x9859d, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - person_event SPRITE_SAGE, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x985a0, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + person_event SPRITE_SAGE, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + person_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + person_event SPRITE_SAGE, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 person_event SPRITE_SAGE, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 person_event SPRITE_SAGE, 6, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 person_event SPRITE_SAGE, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 diff --git a/maps/blockdata.asm b/maps/blockdata.asm index e6c3e7ae9..c14b30743 100644 --- a/maps/blockdata.asm +++ b/maps/blockdata.asm @@ -443,7 +443,7 @@ TimeCapsule_BlockData: EcruteakLugiaSpeechHouse_BlockData: EcruteakItemfinderHouse_BlockData: VioletNicknameSpeechHouse_BlockData: -VioletOnixTradeHouse_BlockData: +VioletKylesHouse_BlockData: INCBIN "maps/House2.blk" BetaCave_BlockData: diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 378356624..3b2607e31 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -1,3 +1,20 @@ +map_header: macro +;\1: map label +;\2: tileset: a TILESET_* constant +;\3: permission: TOWN, ROUTE, INDOOR, CAVE, PERM_5, GATE, or DUNGEON +;\4: location: from constants/landmark_constants.asm +;\5: music: a MUSIC_* constant +;\6: phone service flag: 1 to prevent phone calls +;\7: time of day: a PALETTE_* constant +;\8: fishing group: a FISHGROUP_* constant +\1_MapHeader: + db BANK(\1_SecondMapHeader), \2, \3 + dw \1_SecondMapHeader + db \4, \5 + dn \6, \7 + db \8 +endm + MapGroupPointers:: ; pointers to the first map header of each map group dw MapGroup_Olivine ; 1 @@ -27,7 +44,6 @@ MapGroupPointers:: dw MapGroup_Saffron ; 25 dw MapGroup_Cherrygrove ; 26 - MapGroup_Olivine: map_header OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineGym, TILESET_OLIVINE_GYM, INDOOR, OLIVINE_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE @@ -235,7 +251,7 @@ MapGroup_Violet: map_header EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletNicknameSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VioletOnixTradeHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header VioletKylesHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index b58895f4b..e81c8c774 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -1,3 +1,90 @@ +map_header_2: macro +;\1: map label +;\2: map id +;\3: border block +;\4: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none +\1_SecondMapHeader:: + db \3 + db \2_HEIGHT, \2_WIDTH + db BANK(\1_BlockData) + dw \1_BlockData + db BANK(\1_MapScriptHeader) + dw \1_MapScriptHeader + dw \1_MapEventHeader + db \4 +endm + +connection: macro +if "\1" == "north" +;\2: map id +;\3: map label (eventually will be rolled into map id) +;\4: x +;\5: offset? +;\6: strip length +;\7: this map id + map \2 + dw \3_BlockData + \2_WIDTH * (\2_HEIGHT - 3) + \5 + dw OverworldMap + \4 + 3 + db \6 + db \2_WIDTH + db \2_HEIGHT * 2 - 1 + db (\4 - \5) * -2 + dw OverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1 +endc + +if "\1" == "south" +;\2: map id +;\3: map label (eventually will be rolled into map id) +;\4: x +;\5: offset? +;\6: strip length +;\7: this map id + map \2 + dw \3_BlockData + \5 + dw OverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3 + db \6 + db \2_WIDTH + db 0 + db (\4 - \5) * -2 + dw OverworldMap + \2_WIDTH + 7 +endc + +if "\1" == "west" +;\2: map id +;\3: map label (eventually will be rolled into map id) +;\4: y +;\5: offset? +;\6: strip length +;\7: this map id + map \2 + dw \3_BlockData + (\2_WIDTH * \5) + \2_WIDTH - 3 + dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3) + db \6 + db \2_WIDTH + db (\4 - \5) * -2 + db \2_WIDTH * 2 - 1 + dw OverworldMap + \2_WIDTH * 2 + 6 +endc + +if "\1" == "east" +;\2: map id +;\3: map label (eventually will be rolled into map id) +;\4: y +;\5: offset? +;\6: strip length +;\7: this map id + map \2 + dw \3_BlockData + (\2_WIDTH * \5) + dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3 + db \6 + db \2_WIDTH + db (\4 - \5) * -2 + db 0 + dw OverworldMap + \2_WIDTH + 7 +endc +endm + + map_header_2 NewBarkTown, NEW_BARK_TOWN, $5, WEST | EAST connection west, ROUTE_29, Route29, 0, 0, 9, NEW_BARK_TOWN connection east, ROUTE_27, Route27, 0, 0, 9, NEW_BARK_TOWN @@ -427,7 +514,7 @@ map_header_2 EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $0, 0 map_header_2 VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $0, 0 map_header_2 VioletPokecenter1F, VIOLET_POKECENTER_1F, $0, 0 - map_header_2 VioletOnixTradeHouse, VIOLET_ONIX_TRADE_HOUSE, $0, 0 + map_header_2 VioletKylesHouse, VIOLET_KYLES_HOUSE, $0, 0 map_header_2 Route32RuinsOfAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $0, 0 map_header_2 Route32Pokecenter1F, ROUTE_32_POKECENTER_1F, $0, 0 map_header_2 Route35GoldenrodGate, ROUTE_35_GOLDENROD_GATE, $0, 0 diff --git a/misc/battle_tower_47.asm b/mobile/battle_tower_47.asm similarity index 99% rename from misc/battle_tower_47.asm rename to mobile/battle_tower_47.asm index f9e2ac0ea..d0ca6edd8 100755 --- a/misc/battle_tower_47.asm +++ b/mobile/battle_tower_47.asm @@ -85,7 +85,7 @@ ENDC ret ; 11c05d -INCLUDE "misc/fixed_words.asm" +INCLUDE "mobile/fixed_words.asm" BTTrainerClassGenders: ; 11f2f0 db MALE ; FALKNER diff --git a/misc/battle_tower_5c.asm b/mobile/battle_tower_5c.asm similarity index 97% rename from misc/battle_tower_5c.asm rename to mobile/battle_tower_5c.asm index 462e4f75a..4ab57ea2c 100755 --- a/misc/battle_tower_5c.asm +++ b/mobile/battle_tower_5c.asm @@ -107,7 +107,7 @@ Function170139: ; 170139 ld e, l ld d, h ld hl, PlayerName - ld bc, 5 ; Japanese name length + ld bc, NAME_LENGTH_JAPANESE - 1 call CopyBytes ld bc, PlayerID ld de, PlayerGender @@ -159,7 +159,7 @@ Function170139: ; 170139 ld a, $5 call GetSRAMBank ld hl, $a894 - ld bc, 6 + ld bc, NAME_LENGTH_JAPANESE call CopyBytes ld hl, wMisc ld de, $a948 @@ -612,11 +612,11 @@ CopyBTTrainer_FromBT_OT_TowBT_OTTemp: ; 1704a2 ; copy the BattleTower-Trainer data that lies at 'BT_OTTrainer' to 'wBT_OTTemp' ld a, [rSVBK] push af - ld a, $3 ; BANK(BT_OTTrainer) + ld a, BANK(BT_OTTrainer) ld [rSVBK], a - ld hl, BT_OTTrainer ; $d100 - ld de, wBT_OTTemp ; wMisc + ld hl, BT_OTTrainer + ld de, wBT_OTTemp ld bc, BATTLE_TOWER_STRUCT_LENGTH call CopyBytes @@ -879,7 +879,7 @@ Function1704e1: ; 1704e1 ld de, wcd49 push bc call PlaceString - ld de, 6 + ld de, NAME_LENGTH_JAPANESE add hl, de pop bc pop af @@ -1079,9 +1079,9 @@ BattleTowerAction_CheckExplanationRead: ; 17075f (5c:475f) BattleTowerAction $00 and a ret z - ld a, BANK(s1_be4f) + ld a, BANK(sBattleTowerSaveFileFlags) call GetSRAMBank - ld a, [s1_be4f] + ld a, [sBattleTowerSaveFileFlags] and $2 ld [ScriptVar], a call CloseSRAM @@ -1097,11 +1097,11 @@ BattleTowerAction_GetChallengeState: ; 170778 (5c:4778) BattleTowerAction $02 ret BattleTowerAction_SetExplanationRead: ; 170788 (5c:4788) BattleTowerAction $01 - ld a, BANK(s1_be4f) + ld a, BANK(sBattleTowerSaveFileFlags) call GetSRAMBank - ld a, [s1_be4f] + ld a, [sBattleTowerSaveFileFlags] or $2 - ld [s1_be4f], a + ld [sBattleTowerSaveFileFlags], a call CloseSRAM ret @@ -1362,7 +1362,7 @@ BattleTowerAction_EggTicket: ; 17093c (5c:493c) BattleTowerAction $0e jr nz, .not_egg push hl ld hl, PartyMonOT - ld de, $6 ; NAME_LENGTH + ld de, NAME_LENGTH_JAPANESE ld a, b and a jr z, .skip @@ -1372,7 +1372,7 @@ BattleTowerAction_EggTicket: ; 17093c (5c:493c) BattleTowerAction $0e jr nz, .loop2 .skip ld de, String_1709a4 - ld a, $6 ; NAME_LENGTH + ld a, NAME_LENGTH_JAPANESE .compare_loop push af ld a, [de] @@ -1583,20 +1583,20 @@ Function170abe: ; 170abe (5c:4abe) BattleTowerAction $14 and a ret z - ld a, BANK(s1_be4f) + ld a, BANK(sBattleTowerSaveFileFlags) call GetSRAMBank - ld a, [s1_be4f] + ld a, [sBattleTowerSaveFileFlags] and $1 ld [ScriptVar], a call CloseSRAM ret Function170ad7: ; 170ad7 (5c:4ad7) BattleTowerAction $15 - ld a, BANK(s1_be4f) + ld a, BANK(sBattleTowerSaveFileFlags) call GetSRAMBank - ld a, [s1_be4f] + ld a, [sBattleTowerSaveFileFlags] or $1 - ld [s1_be4f], a + ld [sBattleTowerSaveFileFlags], a call CloseSRAM ret diff --git a/misc/fixed_words.asm b/mobile/fixed_words.asm similarity index 99% rename from misc/fixed_words.asm rename to mobile/fixed_words.asm index 56e53da91..d98470095 100755 --- a/misc/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -257,7 +257,7 @@ CopyMobileEZChatToC608: ; 11c156 sla c rl b add hl, bc - ld bc, 5 ; length of a string + ld bc, NAME_LENGTH_JAPANESE - 1 .copy_string ld de, $c608 call CopyBytes @@ -3236,7 +3236,7 @@ EZChat_GetCategoryWordsByKana: ; 11d4aa push hl ; skip to the attributes - ld hl, 5 ; length of a string + ld hl, NAME_LENGTH_JAPANESE - 1 add hl, de ; get the number of words in the category diff --git a/mobile/get_trainer_class.asm b/mobile/get_trainer_class.asm new file mode 100644 index 000000000..37fe91c56 --- /dev/null +++ b/mobile/get_trainer_class.asm @@ -0,0 +1,46 @@ +GetMobileOTTrainerClass: ; mobile function + ld h, b + ld l, c + call .GetMobileOTTrainerClass + ld c, a + ret + +.GetMobileOTTrainerClass: ; 4e930 + ld a, [hli] + xor [hl] + ld c, a + jr z, .skip_male_trainers + srl c + srl c +.male_trainer_loop + srl c + ld a, c + cp MaleTrainersEnd - MaleTrainers - 1 + jr nc, .male_trainer_loop + inc c + +.skip_male_trainers + ld a, [de] + cp $1 + ld hl, MaleTrainers + jr nz, .finished + + ld hl, FemaleTrainers + ld a, c + and a + jr z, .finished + +.female_trainer_loop + srl c + ld a, c + cp FemaleTrainersEnd - FemaleTrainers - 1 + jr nc, .female_trainer_loop + inc c + +.finished + ld b, $0 + add hl, bc + ld a, [hl] + ret + +INCLUDE "data/trainers/gendered_trainers.asm" diff --git a/misc/mobile_12.asm b/mobile/mobile_12.asm similarity index 99% rename from misc/mobile_12.asm rename to mobile/mobile_12.asm index efe138162..8b21bb6a6 100755 --- a/misc/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -21,13 +21,13 @@ InitMobileProfile: ; 4802f (12:402f) .not_yet_initialized call Function486bf call LoadFontsExtra - ld de, GFX_488c3 + ld de, MobileUpArrowGFX ld hl, VTiles2 tile $10 - lb bc, BANK(GFX_488c3), 1 + lb bc, BANK(MobileUpArrowGFX), 1 call Request1bpp - ld de, GFX_488cb + ld de, MobileDownArrowGFX ld hl, VTiles2 tile $11 - lb bc, BANK(GFX_488cb), 1 + lb bc, BANK(MobileDownArrowGFX), 1 call Request1bpp call Function4a3a7 call ClearBGPalettes @@ -1020,11 +1020,11 @@ Function488b9: ; 488b9 (12:48b9) ret ; 488c3 (12:48c3) -GFX_488c3: ; 488c3 -INCBIN "gfx/unknown/up_arrow.2bpp" +MobileUpArrowGFX: ; 488c3 +INCBIN "gfx/mobile/up_arrow.2bpp" -GFX_488cb: ; 488cb -INCBIN "gfx/unknown/down_arrow.2bpp" +MobileDownArrowGFX: ; 488cb +INCBIN "gfx/mobile/down_arrow.2bpp" Function488d3: ; 488d3 (12:48d3) call Function48283 diff --git a/misc/mobile_12_2.asm b/mobile/mobile_12_2.asm similarity index 100% rename from misc/mobile_12_2.asm rename to mobile/mobile_12_2.asm diff --git a/misc/mobile_22.asm b/mobile/mobile_22.asm similarity index 99% rename from misc/mobile_22.asm rename to mobile/mobile_22.asm index 17b526586..59a858bcd 100644 --- a/misc/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -1,3 +1,5 @@ +String_89116: + db "-----@" String_8911c: ; 8911c db "でんわばんごうが ただしく" ; Phone number is not @@ -379,7 +381,7 @@ Function89331: ; 89331 ; Sets carry if it does not find a nonspace character. ; Returns the location of the following character in hl. push bc - ld c, 5 + ld c, NAME_LENGTH_JAPANESE - 1 .loop ld a, [hli] cp "@" @@ -408,12 +410,12 @@ Function89346: ; 89346 (22:5346) jr _incave Function8934a: ; 8934a - ld hl, 6 + ld hl, NAME_LENGTH_JAPANESE add hl, bc _incave: ; Scans up to 5 characters starting at hl, looking for a nonspace character up to the next terminator. Sets carry if it does not find a nonspace character. Returns the location of the following character in hl. push bc - ld c, 5 + ld c, NAME_LENGTH_JAPANESE - 1 .loop ld a, [hli] cp "@" @@ -446,7 +448,7 @@ Function89363: ; 89363 ._incave push de - ld e, 6 + ld e, NAME_LENGTH_JAPANESE .loop ld a, [hli] cp -1 @@ -2392,7 +2394,7 @@ Function89e9a: ; 89e9a (22:5e9a) ld a, $5 ld [rSVBK], a ld hl, Palette_89eb1 - ld de, UnknBGPals + 5 palettes + ld de, UnknBGPals palette 5 ld bc, 1 palettes call CopyBytes pop af diff --git a/misc/mobile_22_2.asm b/mobile/mobile_22_2.asm similarity index 100% rename from misc/mobile_22_2.asm rename to mobile/mobile_22_2.asm diff --git a/misc/mobile_40.asm b/mobile/mobile_40.asm similarity index 99% rename from misc/mobile_40.asm rename to mobile/mobile_40.asm index fa6a39fdf..79cba8310 100644 --- a/misc/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -1,3 +1,5 @@ +SECTION "mobile_40", ROMX + Function100000: ; 100000 ; d: 1 or 2 ; e: bank @@ -2677,7 +2679,7 @@ LoadSelectedPartiesForColosseum: ; 1010f2 .CopyThreeSpecies: ; 101145 ; Load the 3 choices to the buffer push de - ld bc, StringBuffer2 + 6 + ld bc, StringBuffer2 + NAME_LENGTH_JAPANESE xor a .party_loop push af @@ -2693,7 +2695,7 @@ LoadSelectedPartiesForColosseum: ; 1010f2 ld a, 3 ld [de], a inc de - ld hl, StringBuffer2 + 6 + ld hl, StringBuffer2 + NAME_LENGTH_JAPANESE ld bc, 3 call CopyBytes ld a, $ff diff --git a/misc/mobile_41.asm b/mobile/mobile_41.asm similarity index 99% rename from misc/mobile_41.asm rename to mobile/mobile_41.asm index 37e10a01e..9ab9f7ed2 100755 --- a/misc/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -1,5 +1,3 @@ -SECTION "bank41_2", ROMX - ; These functions deal with miscellaneous statistics ; which were used for Trainer Rankings in Pokémon News. diff --git a/misc/mobile_42.asm b/mobile/mobile_42.asm similarity index 99% rename from misc/mobile_42.asm rename to mobile/mobile_42.asm index b625d6bcf..98bbcf485 100644 --- a/misc/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -947,7 +947,7 @@ MobileTradeAnim_GiveTrademon1: ; 108763 ld de, SFX_GIVE_TRADEMON call PlaySFX ld c, 40 - ld hl, BGPals + 6 palettes + ld hl, BGPals palette 6 call Function1082f0 call Function108af4 .loop @@ -1179,7 +1179,7 @@ MobileTradeAnim_GetTrademon2: ; 108894 MobileTradeAnim_GetTrademon3: ; 10890a ld c, 40 - ld hl, BGPals + 6 palettes + ld hl, BGPals palette 6 call Function1082f0 call Function108af4 call GetMobileTradeAnimByte @@ -1718,7 +1718,7 @@ Function108c80: ; 108c80 ; 108c9b DebugMobileTrade: ; 108c9b -; localization error: NAME_LENGTH (11) should be 6 here +; localization error: NAME_LENGTH (11) should be NAME_LENGTH_JAPANESE (6) here ld hl, .DebugTradeData ld a, [hli] diff --git a/misc/mobile_45.asm b/mobile/mobile_45.asm similarity index 99% rename from misc/mobile_45.asm rename to mobile/mobile_45.asm index d6743acc2..6c581de87 100644 --- a/misc/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -1895,7 +1895,7 @@ Function114b55: ; 114b55 .asm_114b8c pop hl xor a -rept 6 +rept NAME_LENGTH_JAPANESE ld [hli], a endr jr .asm_114b82 @@ -5342,7 +5342,7 @@ Function115d80: ; 115d80 ; 115d99 -INCLUDE "misc/mobile_45_sprite_engine.asm" +INCLUDE "mobile/mobile_45_sprite_engine.asm" ; 116567 diff --git a/misc/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm similarity index 99% rename from misc/mobile_45_sprite_engine.asm rename to mobile/mobile_45_sprite_engine.asm index a85e7fce4..8493a3cf8 100755 --- a/misc/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -523,12 +523,12 @@ Function116294: ; 116294 push af ld a, $5 ld [rSVBK], a - ld hl, UnknBGPals + 8 * 6 + ld hl, UnknBGPals palette 6 ld de, $c320 ld bc, 2 palettes call CopyBytes ld hl, Palette_11734e - ld de, UnknBGPals + 8 * 7 + ld de, UnknBGPals palette 7 ld bc, 1 palettes call CopyBytes call SetPalettes diff --git a/misc/mobile_46.asm b/mobile/mobile_46.asm similarity index 99% rename from misc/mobile_46.asm rename to mobile/mobile_46.asm index 48fed0f33..19b255c34 100755 --- a/misc/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -3015,6 +3015,7 @@ Unknown_1196b8: ; 1196b8 db "Sun" ; 1196cd + SECTION "bank46_2", ROMX ; A hack to use ascii above. @@ -7102,7 +7103,7 @@ Mobile46_RunJumptable: ; 11b45c Function11b483: ; 11b483 call .InitRAM ld hl, PlayerName - ld a, $5 ; Japanese Name Length + ld a, NAME_LENGTH_JAPANESE - 1 .loop1 push af ld a, [hli] diff --git a/misc/mobile_5b.asm b/mobile/mobile_5b.asm similarity index 98% rename from misc/mobile_5b.asm rename to mobile/mobile_5b.asm index 679f04342..041c071b4 100755 --- a/misc/mobile_5b.asm +++ b/mobile/mobile_5b.asm @@ -221,13 +221,13 @@ MobileSystemSplashScreen_InitGFX: ; 16c108 ; 16c173 .Tiles: -INCBIN "gfx/unknown/mobile_splash.2bpp" +INCBIN "gfx/mobile/mobile_splash.2bpp" .TileMap: -INCBIN "gfx/unknown/mobile_splash.tilemap" +INCBIN "gfx/mobile/mobile_splash.tilemap" .AttrMap: -INCBIN "gfx/unknown/mobile_splash.attrmap" +INCBIN "gfx/mobile/mobile_splash.attrmap" UnknownMobilePalettes_16c903: ; 16c903 INCLUDE "gfx/unknown/16c903.pal" diff --git a/misc/mobile_5c.asm b/mobile/mobile_5c.asm similarity index 98% rename from misc/mobile_5c.asm rename to mobile/mobile_5c.asm index 5b7418a0f..3294cc3dc 100755 --- a/misc/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -44,13 +44,13 @@ Function17005a: ; 17005a ld [wOTTrademonSpecies], a ld hl, $a827 ld de, wOTTrademonSenderName - ld bc, 5 ; Japanese Name Length + ld bc, NAME_LENGTH_JAPANESE - 1 call CopyBytes ld a, "@" ld [de], a ld hl, $a85c ld de, wOTTrademonOTName - ld bc, 5 ; Japanese Name Length + ld bc, NAME_LENGTH_JAPANESE - 1 call CopyBytes ld a, "@" ld [de], a @@ -75,7 +75,7 @@ Function17005a: ; 17005a ; 1700b0 -INCLUDE "misc/battle_tower_5c.asm" +INCLUDE "mobile/battle_tower_5c.asm" Function170be4: ; 170be4 ld a, $5 @@ -305,10 +305,10 @@ Function170d02: ; 170d02 ; 170d16 LZ_170d16: -INCBIN "gfx/unknown/pichu_animated.2bpp.lz" +INCBIN "gfx/mobile/pichu_animated.2bpp.lz" LZ_1715a4: -INCBIN "gfx/unknown/egg_animated.2bpp.lz" +INCBIN "gfx/mobile/electro_ball.2bpp.lz" GFX_171848: INCBIN "gfx/unknown/171848.2bpp" @@ -819,7 +819,8 @@ Palette_171d71: RGB 0, 0, 0 GFX_171db1: -INCBIN "gfx/unknown/ascii_font.2bpp" +INCBIN "gfx/mobile/ascii_font.2bpp" + Tilemap_172491: INCBIN "gfx/unknown/172491.tilemap" Tilemap_17251d: @@ -832,6 +833,7 @@ Attrmap_1727ed: INCBIN "gfx/unknown/1727ed.attrmap" Attrmap_172955: INCBIN "gfx/unknown/172955.attrmap" + LZ_172abd: INCBIN "gfx/pokedex/slowpoke.2bpp.lz" diff --git a/misc/crystal_misc.asm b/mobile/mobile_5e.asm similarity index 99% rename from misc/crystal_misc.asm rename to mobile/mobile_5e.asm index aa5c704fd..baf247fe2 100644 --- a/misc/crystal_misc.asm +++ b/mobile/mobile_5e.asm @@ -1,12 +1,6 @@ -INCLUDE "includes.asm" - - -SECTION "Misc Crystal", ROMX - MobileAdapterGFX:: INCBIN "gfx/mobile/mobile_adapter.2bpp" - Function17a68f:: ; 17a68f (5e:668f) call Function17a6a8 call Function17a751 diff --git a/misc/mobile_5f.asm b/mobile/mobile_5f.asm similarity index 99% rename from misc/mobile_5f.asm rename to mobile/mobile_5f.asm index 816e23394..9b0c5455b 100644 --- a/misc/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -1,8 +1,4 @@ - -SECTION "bank5F", ROMX - Function17c000: ; 17c000 - call DisableLCD ld hl, VTiles2 diff --git a/misc/mobile_menu.asm b/mobile/mobile_menu.asm similarity index 99% rename from misc/mobile_menu.asm rename to mobile/mobile_menu.asm index 1bee0cced..6a4e6cf61 100755 --- a/misc/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -192,7 +192,7 @@ Function4a0c2: ; 4a0c2 (12:60c2) call GetSRAMBank ld hl, sPlayerData + PlayerName - wPlayerData ld de, PlayerName - ld bc, 6 ; japanese name length + ld bc, NAME_LENGTH_JAPANESE call CopyBytes call CloseSRAM callba _LoadData diff --git a/mobile/news/news.asm b/mobile/news/news.asm new file mode 100644 index 000000000..b95df06aa --- /dev/null +++ b/mobile/news/news.asm @@ -0,0 +1,44 @@ +; http://forums.glitchcity.info/index.php?topic=7509.msg206449#msg206449 + + db $cc, $6b, $1e ; XXX + +Function1f4003: ; 1f4003 +; XXX + ld a, $6 + call GetSRAMBank + ld hl, .news_data + ld de, $a000 + ld bc, $1000 + call CopyBytes + call CloseSRAM + ret + +.news_data +INCBIN "mobile/news/news_1.bin" + +Function1f4dbe: ; 1f4dbe +; XXX + ld a, $6 + call GetSRAMBank + ld hl, .news_data + ld de, $a000 + ld bc, $1000 + call CopyBytes + call CloseSRAM + ret + +.news_data +INCBIN "mobile/news/news_2.bin" + +Function1f5d9f: ; 1f5d9f + ld a, $6 + call GetSRAMBank + ld hl, .news_data + ld de, $a000 + ld bc, $1000 + call CopyBytes + call CloseSRAM + ret + +.news_data +INCBIN "mobile/news/news_3.bin" diff --git a/unknown/1f4018.bin b/mobile/news/news_1.bin similarity index 100% rename from unknown/1f4018.bin rename to mobile/news/news_1.bin diff --git a/unknown/1f4dd3.bin b/mobile/news/news_2.bin similarity index 100% rename from unknown/1f4dd3.bin rename to mobile/news/news_2.bin diff --git a/unknown/1f5db4.bin b/mobile/news/news_3.bin similarity index 100% rename from unknown/1f5db4.bin rename to mobile/news/news_3.bin diff --git a/mobile/print_opp_message.asm b/mobile/print_opp_message.asm new file mode 100644 index 000000000..0be18acae --- /dev/null +++ b/mobile/print_opp_message.asm @@ -0,0 +1,30 @@ +Mobile_PrintOpponentBattleMessage: ; 4ea0a + ld a, c + push af + call SpeechTextBox + call MobileTextBorder + pop af + dec a + ld bc, $c + ld hl, w5_MobileOpponentBattleMessages + call AddNTimes + ld de, wMobileOpponentBattleMessage + ld bc, $c + ld a, $5 ; BANK(w5_MobileOpponentBattleMessages) + call FarCopyWRAM + + ld a, [rSVBK] + push af + ld a, $1 + ld [rSVBK], a + + ld bc, wMobileOpponentBattleMessage + decoord 1, 14 + callba PrintEZChatBattleMessage + + pop af + ld [rSVBK], a + + ld c, 180 + call DelayFrames + ret diff --git a/misc/stadium2_1.bin b/mobile/stadium/stadium2_1.bin similarity index 100% rename from misc/stadium2_1.bin rename to mobile/stadium/stadium2_1.bin diff --git a/misc/stadium2_2.bin b/mobile/stadium/stadium2_2.bin similarity index 100% rename from misc/stadium2_2.bin rename to mobile/stadium/stadium2_2.bin diff --git a/pokecrystal.link b/pokecrystal.link index 2281ba6d7..6002adbf5 100644 --- a/pokecrystal.link +++ b/pokecrystal.link @@ -173,7 +173,6 @@ ROMX $40 "bank40_3" ROMX $41 "bank41" - "bank41_2" ROMX $42 "mobile_42" "Intro Logo" @@ -243,7 +242,7 @@ ROMX $5e "bank5E" "Songs 5" "Crystal Sound Effects" - "Misc Crystal" + "mobile_5e" ROMX $5f "bank5F" ROMX $60 @@ -301,13 +300,13 @@ ROMX $7b ROMX $7c "Battle Tower Trainer Data" ROMX $7d - "bank7D" + "Mobile News Data" ROMX $7e "bank7E" ROMX $7f "bank7F" org $7de0 - "stadium2" + "Mobile Stadium 2" WRAM0 "Stack" "Audio RAM" diff --git a/sram.asm b/sram.asm index 22b377b3c..163de6bda 100644 --- a/sram.asm +++ b/sram.asm @@ -1,9 +1,11 @@ SRAM_Begin EQU $a000 SRAM_End EQU $c000 + GLOBAL SRAM_Begin, SRAM_End SECTION "Scratch", SRAM + sScratch:: @@ -11,12 +13,12 @@ SECTION "SRAM Bank 0", SRAM ; a600 sPartyMail:: -sPartyMon1Mail:: mailmsg sPartyMon1Mail -sPartyMon2Mail:: mailmsg sPartyMon2Mail -sPartyMon3Mail:: mailmsg sPartyMon3Mail -sPartyMon4Mail:: mailmsg sPartyMon4Mail -sPartyMon5Mail:: mailmsg sPartyMon5Mail -sPartyMon6Mail:: mailmsg sPartyMon6Mail +sPartyMon1Mail:: mailmsg sPartyMon1Mail +sPartyMon2Mail:: mailmsg sPartyMon2Mail +sPartyMon3Mail:: mailmsg sPartyMon3Mail +sPartyMon4Mail:: mailmsg sPartyMon4Mail +sPartyMon5Mail:: mailmsg sPartyMon5Mail +sPartyMon6Mail:: mailmsg sPartyMon6Mail ; a71a sPartyMailBackup:: @@ -28,45 +30,45 @@ sPartyMon5MailBackup:: mailmsg sPartyMon5MailBackup sPartyMon6MailBackup:: mailmsg sPartyMon6MailBackup ; a834 -sMailboxCount:: ds 1 +sMailboxCount:: db sMailbox:: -sMailbox1:: mailmsg sMailbox1 -sMailbox2:: mailmsg sMailbox2 -sMailbox3:: mailmsg sMailbox3 -sMailbox4:: mailmsg sMailbox4 -sMailbox5:: mailmsg sMailbox5 -sMailbox6:: mailmsg sMailbox6 -sMailbox7:: mailmsg sMailbox7 -sMailbox8:: mailmsg sMailbox8 -sMailbox9:: mailmsg sMailbox9 -sMailbox10:: mailmsg sMailbox10 +sMailbox1:: mailmsg sMailbox1 +sMailbox2:: mailmsg sMailbox2 +sMailbox3:: mailmsg sMailbox3 +sMailbox4:: mailmsg sMailbox4 +sMailbox5:: mailmsg sMailbox5 +sMailbox6:: mailmsg sMailbox6 +sMailbox7:: mailmsg sMailbox7 +sMailbox8:: mailmsg sMailbox8 +sMailbox9:: mailmsg sMailbox9 +sMailbox10:: mailmsg sMailbox10 ; aa0b -sMailboxCountBackup:: ds 1 +sMailboxCountBackup:: db sMailboxBackup:: -sMailbox1Backup:: mailmsg sMailbox1Backup -sMailbox2Backup:: mailmsg sMailbox2Backup -sMailbox3Backup:: mailmsg sMailbox3Backup -sMailbox4Backup:: mailmsg sMailbox4Backup -sMailbox5Backup:: mailmsg sMailbox5Backup -sMailbox6Backup:: mailmsg sMailbox6Backup -sMailbox7Backup:: mailmsg sMailbox7Backup -sMailbox8Backup:: mailmsg sMailbox8Backup -sMailbox9Backup:: mailmsg sMailbox9Backup -sMailbox10Backup:: mailmsg sMailbox10Backup +sMailbox1Backup:: mailmsg sMailbox1Backup +sMailbox2Backup:: mailmsg sMailbox2Backup +sMailbox3Backup:: mailmsg sMailbox3Backup +sMailbox4Backup:: mailmsg sMailbox4Backup +sMailbox5Backup:: mailmsg sMailbox5Backup +sMailbox6Backup:: mailmsg sMailbox6Backup +sMailbox7Backup:: mailmsg sMailbox7Backup +sMailbox8Backup:: mailmsg sMailbox8Backup +sMailbox9Backup:: mailmsg sMailbox9Backup +sMailbox10Backup:: mailmsg sMailbox10Backup ; abe2 -sMysteryGiftItem:: ds 1 -sMysteryGiftUnlocked:: ds 1 -sBackupMysteryGiftItem:: ds 1 -sNumDailyMysteryGiftPartnerIDs:: ds 1 +sMysteryGiftItem:: db +sMysteryGiftUnlocked:: db +sBackupMysteryGiftItem:: db +sNumDailyMysteryGiftPartnerIDs:: db sDailyMysteryGiftPartnerIDs:: ds 5 * 2 ; maximum 5 per day, 2 bytes per ID sMysteryGiftDecorationsReceived:: flag_array NUM_NON_TROPHY_DECOS ds 4 -sMysteryGiftTimer:: ds 1 -sMysteryGiftTimerStartDay:: ds 1 +sMysteryGiftTimer:: db +sMysteryGiftTimerStartDay:: db ds 1 -sMysteryGiftTrainerHouseFlag:: ds 1 +sMysteryGiftTrainerHouseFlag:: db sMysteryGiftPartnerName:: ds NAME_LENGTH s0_ac09:: ds 1 sMysteryGiftTrainer:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 2 ; ac0a @@ -75,13 +77,15 @@ sBackupMysteryGiftItemEnd:: ds $30 sRTCStatusFlags:: ds 8 -sLuckyNumberDay:: ds 1 -sLuckyIDNumber:: ds 2 +sLuckyNumberDay:: db +sLuckyIDNumber:: dw + SECTION "Backup Save", SRAM + sBackupOptions:: ds OptionsEnd - Options -s0_b208:: ds 1 ; loaded with 99, used to check save corruption +sBackupCheckValue1:: db ; loaded with SAVE_CHECK_VALUE_1, used to check save corruption sBackupGameData:: ; b209 sBackupPlayerData:: ds wPlayerDataEnd - wPlayerData @@ -93,16 +97,18 @@ sBackupGameDataEnd:: ds $18a ; bf0d -sBackupChecksum:: ds 2 -s0_bf0f:: ds 1 ; loaded with 0x7f, used to check save corruption -sStackTop:: ds 2 +sBackupChecksum:: dw + +sBackupCheckValue2:: db ; loaded with SAVE_CHECK_VALUE_2, used to check save corruption + +sStackTop:: dw SECTION "Save", SRAM sOptions:: ds OptionsEnd - Options -s1_a008:: ds 1 ; loaded with 99, used to check save corruption +sCheckValue1:: db ; loaded with SAVE_CHECK_VALUE_1, used to check save corruption sGameData:: ; a009 sPlayerData:: ds wPlayerDataEnd - wPlayerData @@ -114,29 +120,29 @@ sGameDataEnd:: ds $18a ; ad0d -sChecksum:: ds 2 -s1_ad0f:: ds 1 ; loaded with 0x7f, used to check save corruption +sChecksum:: dw + +sCheckValue2:: db ; loaded with SAVE_CHECK_VALUE_2, used to check save corruption + SECTION "Active Box", SRAM + ; ad10 box sBox ; b160 ds $f4 + + SECTION "Link Battle Data", SRAM + sLinkBattleResults:: ds $c -sLinkBattleStats:: ; b260 -sLinkBattleWins:: ds 2 -sLinkBattleLosses:: ds 2 ; b262 -sLinkBattleDraws:: ds 2 ; b264 -link_battle_record: MACRO -\1Name:: ds NAME_LENGTH +- 1 -\1ID:: ds 2 -\1Wins:: ds 2 -\1Losses:: ds 2 -\1Draws:: ds 2 -endm +sLinkBattleStats:: +sLinkBattleWins:: dw ; b260 +sLinkBattleLosses:: dw ; b262 +sLinkBattleDraws:: dw ; b264 + sLinkBattleRecord:: sLinkBattleRecord1:: link_battle_record sLinkBattleRecord1 sLinkBattleRecord2:: link_battle_record sLinkBattleRecord2 @@ -145,88 +151,80 @@ sLinkBattleRecord4:: link_battle_record sLinkBattleRecord4 sLinkBattleRecord5:: link_battle_record sLinkBattleRecord5 sLinkBattleStatsEnd:: -SECTION "SRAM Hall of Fame", SRAM -sHallOfFame:: ; b2c0 -; temporary until I can find a way to macrofy it - hall_of_fame sHallOfFame01 - hall_of_fame sHallOfFame02 - hall_of_fame sHallOfFame03 - hall_of_fame sHallOfFame04 - hall_of_fame sHallOfFame05 - hall_of_fame sHallOfFame06 - hall_of_fame sHallOfFame07 - hall_of_fame sHallOfFame08 - hall_of_fame sHallOfFame09 - hall_of_fame sHallOfFame10 - hall_of_fame sHallOfFame11 - hall_of_fame sHallOfFame12 - hall_of_fame sHallOfFame13 - hall_of_fame sHallOfFame14 - hall_of_fame sHallOfFame15 - hall_of_fame sHallOfFame16 - hall_of_fame sHallOfFame17 - hall_of_fame sHallOfFame18 - hall_of_fame sHallOfFame19 - hall_of_fame sHallOfFame20 - hall_of_fame sHallOfFame21 - hall_of_fame sHallOfFame22 - hall_of_fame sHallOfFame23 - hall_of_fame sHallOfFame24 - hall_of_fame sHallOfFame25 - hall_of_fame sHallOfFame26 - hall_of_fame sHallOfFame27 - hall_of_fame sHallOfFame28 - hall_of_fame sHallOfFame29 - hall_of_fame sHallOfFame30 -; x = 1 -; rept NUM_HOF_TEAMS -; ; PRINTT("{x}\n") -; if STRLEN({x}) == 2 - ; PRINTT(STRSUB({x},2,1)) - ; hall_of_fame STRCAT("sHallOfFame0", STRSUB({x},2,1)) -; else - ; PRINTT(STRSUB({x},2,2)) - ; hall_of_fame STRCAT("sHallOfFame", STRSUB({x},2,2)) -; endc -; x = x + 1 -; endr +SECTION "SRAM Hall of Fame", SRAM + +sHallOfFame:: ; b2c0 +sHallOfFame01:: hall_of_fame sHallOfFame01 +sHallOfFame02:: hall_of_fame sHallOfFame02 +sHallOfFame03:: hall_of_fame sHallOfFame03 +sHallOfFame04:: hall_of_fame sHallOfFame04 +sHallOfFame05:: hall_of_fame sHallOfFame05 +sHallOfFame06:: hall_of_fame sHallOfFame06 +sHallOfFame07:: hall_of_fame sHallOfFame07 +sHallOfFame08:: hall_of_fame sHallOfFame08 +sHallOfFame09:: hall_of_fame sHallOfFame09 +sHallOfFame10:: hall_of_fame sHallOfFame10 +sHallOfFame11:: hall_of_fame sHallOfFame11 +sHallOfFame12:: hall_of_fame sHallOfFame12 +sHallOfFame13:: hall_of_fame sHallOfFame13 +sHallOfFame14:: hall_of_fame sHallOfFame14 +sHallOfFame15:: hall_of_fame sHallOfFame15 +sHallOfFame16:: hall_of_fame sHallOfFame16 +sHallOfFame17:: hall_of_fame sHallOfFame17 +sHallOfFame18:: hall_of_fame sHallOfFame18 +sHallOfFame19:: hall_of_fame sHallOfFame19 +sHallOfFame20:: hall_of_fame sHallOfFame20 +sHallOfFame21:: hall_of_fame sHallOfFame21 +sHallOfFame22:: hall_of_fame sHallOfFame22 +sHallOfFame23:: hall_of_fame sHallOfFame23 +sHallOfFame24:: hall_of_fame sHallOfFame24 +sHallOfFame25:: hall_of_fame sHallOfFame25 +sHallOfFame26:: hall_of_fame sHallOfFame26 +sHallOfFame27:: hall_of_fame sHallOfFame27 +sHallOfFame28:: hall_of_fame sHallOfFame28 +sHallOfFame29:: hall_of_fame sHallOfFame29 +sHallOfFame30:: hall_of_fame sHallOfFame30 sHallOfFameEnd:: -SECTION "SRAM Crystal Data", SRAM -sMobileEventIndex:: ds 1 ; be3c -sCrystalData:: - ds wCrystalDataEnd - wCrystalData -sMobileEventIndexBackup:: ds 1 +SECTION "SRAM Crystal Data", SRAM + +sMobileEventIndex:: db ; be3c + +sCrystalData:: ds wCrystalDataEnd - wCrystalData +sMobileEventIndexBackup:: db + SECTION "SRAM Battle Tower", SRAM -; data of the BattleTower must be in SRAM because you can save and leave between battles -sBattleTowerChallengeState:: ds 1 + +; Battle Tower data must be in SRAM because you can save and leave between battles +sBattleTowerChallengeState:: ; 0: normal ; 2: battle tower + db sBattleTower:: ; be46 -sNrOfBeatenBattleTowerTrainers:: ds 1 -sBTChoiceOfLevelGroup:: ds 1 -; The 7 trainers of the BattleTower are saved here, so nobody appears more than once -sBTTrainers:: ; sbe48 - ds 7 -s1_be4f:: ds 1 -sBattleTowerReward:: ds 1 -; Pkmn of previous trainer +sNrOfBeatenBattleTowerTrainers:: db +sBTChoiceOfLevelGroup:: db +; Battle Tower trainers are saved here, so nobody appears more than once +sBTTrainers:: ds BATTLETOWER_NROFTRAINERS ; sbe48 +sBattleTowerSaveFileFlags:: db +sBattleTowerReward:: db + +; team of previous trainer sBTPkmnOfTrainers:: ; 0xbe51 -sBTPkmnPrevTrainer1:: - ds 1 -sBTPkmnPrevTrainer2:: ds 1 -sBTPkmnPrevTrainer3:: ds 1 -; Pkmn of preprevious trainer -sBTPkmnPrevPrevTrainer1:: ds 1 -sBTPkmnPrevPrevTrainer2:: ds 1 -sBTPkmnPrevPrevTrainer3:: ds 1 +sBTPkmnPrevTrainer1:: db +sBTPkmnPrevTrainer2:: db +sBTPkmnPrevTrainer3:: db +; team of preprevious trainer +sBTPkmnPrevPrevTrainer1:: db +sBTPkmnPrevPrevTrainer2:: db +sBTPkmnPrevPrevTrainer3:: db SECTION "Boxes 1-7", SRAM, BANK [2] + box sBox1 box sBox2 box sBox3 @@ -235,7 +233,9 @@ SECTION "Boxes 1-7", SRAM, BANK [2] box sBox6 box sBox7 + SECTION "Boxes 8-14", SRAM + box sBox8 box sBox9 box sBox10 @@ -245,7 +245,8 @@ SECTION "Boxes 8-14", SRAM box sBox14 SECTION "SRAM Mobile", SRAM, BANK [5] -ds 1 ; Former location for sMobileEventIndex, moved to 1:BE3C in English + + ds 1 ; former location for sMobileEventIndex, moved to 1:BE3C in English sTrainerRankings:: ; a001 sTrainerRankingGameTimeHOF:: ds 4 sTrainerRankingStepCountHOF:: ds 4 @@ -291,9 +292,11 @@ sTrainerRankingShortestMagikarp:: ds 2 sTrainerRankingBugContestScore:: ds 2 sTrainerRankingsChecksum:: ds 2 sTrainerRankingsEnd:: ; a083 + ds 1 ; Former location for sMobileEventIndexBackup, moved to 1:BE44 in English sTrainerRankingsBackup:: ds sTrainerRankingsEnd - sTrainerRankings ds $945 ; aa4b + sMobileLoginPassword:: ds MOBILE_LOGIN_PASSWORD_LENGTH diff --git a/text/common_text.asm b/text/common_text.asm index c4891ab15..d21685480 100644 --- a/text/common_text.asm +++ b/text/common_text.asm @@ -1,12 +1,18 @@ INCLUDE "includes.asm" + SECTION "Text 1", ROMX + INCLUDE "text/common_1.asm" + SECTION "Text 2", ROMX + INCLUDE "text/common_2.asm" INCLUDE "text/common_3.asm" + SECTION "Text 3", ROMX + INCLUDE "text/common_4.asm" INCLUDE "text/common_5.asm" diff --git a/text/unused_gen_1_trainers.asm b/text/unused_gen_1_trainers.asm new file mode 100644 index 000000000..9a637d6a2 --- /dev/null +++ b/text/unused_gen_1_trainers.asm @@ -0,0 +1,92 @@ +GetGen1TrainerClassName: ; 50a28 +; XXX + ld hl, .Strings + ld a, [TrainerClass] + dec a + ld c, a + ld b, 0 + add hl, bc + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + ld de, StringBuffer1 +.copy + ld a, [hli] + ld [de], a + inc de + cp "@" + jr nz, .copy + ret + +.Strings: ; 50a42 +; Untranslated trainer class names from Red. + dw .Youngster + dw .BugCatcher + dw .Lass + dw OTClassName + dw .JrTrainerM + dw .JrTrainerF + dw .Pokemaniac + dw .SuperNerd + dw OTClassName + dw OTClassName + dw .Burglar + dw .Engineer + dw .Jack + dw OTClassName + dw .Swimmer + dw OTClassName + dw OTClassName + dw .Beauty + dw OTClassName + dw .Rocker + dw .Juggler + dw OTClassName + dw OTClassName + dw .Blackbelt + dw OTClassName + dw .ProfOak + dw .Chief + dw .Scientist + dw OTClassName + dw .Rocket + dw .CooltrainerM + dw .CooltrainerF + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + +.Youngster: db "たんパン@" +.BugCatcher: db "むしとり@" +.Lass: db "ミニスカ@" +.JrTrainerM: db "ボーイ@" +.JrTrainerF: db "ガール@" +.Pokemaniac: db "マニア@" +.SuperNerd: db "りかけい@" +.Burglar: db "どろぼう@" +.Engineer: db "ォヤジ@" +.Jack: db "ジャック@" +.Swimmer: db "かいパン@" +.Beauty: db "おねえさん@" +.Rocker: db "グループ@" +.Juggler: db "ジャグラー@" +.Blackbelt: db "からて@" +.ProfOak: db "ォーキド@" +.Chief: db "チーフ@" +.Scientist: db "けんきゅういん@" +.Rocket: db "だんいん@" +.CooltrainerM: db "エりート♂@" +.CooltrainerF: db "エりート♀@" diff --git a/text/sweethoney.asm b/text/unused_sweet_honey.asm similarity index 100% rename from text/sweethoney.asm rename to text/unused_sweet_honey.asm diff --git a/tilesets/house.pal b/tilesets/house_1.pal similarity index 100% rename from tilesets/house.pal rename to tilesets/house_1.pal diff --git a/tilesets/palette_maps.asm b/tilesets/palette_maps.asm index fb7da4cf4..55391aeac 100644 --- a/tilesets/palette_maps.asm +++ b/tilesets/palette_maps.asm @@ -105,8 +105,8 @@ TilesetPlayersHouse2FPalMap: ; 0x4caf5 INCLUDE "tilesets/players_house_2f_palette_map.asm" ; 0x4cb65 -UnusedPalMap1: -INCBIN "tilesets/unused_palette_map_1.bin" +UnusedMuseumPalMap: ; 0x4cb65 +INCLUDE "tilesets/unused_museum_palette_map.asm" ; 4cbd5 TilesetIcePathPalMap: ; 0x4cbd5 @@ -128,7 +128,3 @@ INCLUDE "tilesets/battle_tower_palette_map.asm" TilesetBattleTowerOutsidePalMap: ; 0x4cd95 INCLUDE "tilesets/battle_tower_outside_palette_map.asm" ; 0x4ce05 - -UnusedPalMap2: -INCBIN "tilesets/unused_palette_map_2.bin" -; 4ce1f diff --git a/tilesets/pokecom.pal b/tilesets/pokecom_center.pal similarity index 100% rename from tilesets/pokecom.pal rename to tilesets/pokecom_center.pal diff --git a/tilesets/roofs.asm b/tilesets/roofs.asm index 0e14f3cab..0e43854dd 100644 --- a/tilesets/roofs.asm +++ b/tilesets/roofs.asm @@ -17,7 +17,7 @@ LoadMapGroupRoof:: ; 1c000 ; 1c021 -INCLUDE "data/mapgroup_roofs.asm" +INCLUDE "data/maps/mapgroup_roofs.asm" Roofs: ; 1c03c diff --git a/tilesets/special_palettes.asm b/tilesets/special_palettes.asm new file mode 100644 index 000000000..4e83c7390 --- /dev/null +++ b/tilesets/special_palettes.asm @@ -0,0 +1,200 @@ +LoadSpecialMapPalette: ; 494ac + ld a, [wTileset] + cp TILESET_POKECOM_CENTER + jr z, .pokecom_2f + cp TILESET_BATTLE_TOWER + jr z, .battle_tower + cp TILESET_ICE_PATH + jr z, .ice_path + cp TILESET_HOUSE_1 + jr z, .house + cp TILESET_RADIO_TOWER + jr z, .radio_tower + cp TILESET_CELADON_MANSION + jr z, .mansion_mobile + jr .do_nothing + +.pokecom_2f + call LoadPokeComPalette + scf + ret + +.battle_tower + call LoadBattleTowerPalette + scf + ret + +.ice_path + ld a, [wPermission] ; permission + and $7 + cp INDOOR ; Hall of Fame + jr z, .do_nothing + call LoadIcePathPalette + scf + ret + +.house + call LoadHousePalette + scf + ret + +.radio_tower + call LoadRadioTowerPalette + scf + ret + +.mansion_mobile + call LoadMansionPalette + scf + ret + +.do_nothing + and a + ret +; 494f2 + +LoadPokeComPalette: ; 494f2 + ld a, BANK(UnknBGPals) + ld de, UnknBGPals + ld hl, PokeComPalette + ld bc, 8 palettes + call FarCopyWRAM + ret +; 49501 + +PokeComPalette: ; 49501 +INCLUDE "tilesets/pokecom_center.pal" +; 49541 + +LoadBattleTowerPalette: ; 49541 + ld a, BANK(UnknBGPals) + ld de, UnknBGPals + ld hl, BattleTowerPalette + ld bc, 8 palettes + call FarCopyWRAM + ret +; 49550 + +BattleTowerPalette: ; 49550 +INCLUDE "tilesets/battle_tower.pal" +; 49590 + +LoadIcePathPalette: ; 49590 + ld a, BANK(UnknBGPals) + ld de, UnknBGPals + ld hl, IcePathPalette + ld bc, 8 palettes + call FarCopyWRAM + ret +; 4959f + +IcePathPalette: ; 4959f +INCLUDE "tilesets/ice_path.pal" +; 495df + +LoadHousePalette: ; 495df + ld a, BANK(UnknBGPals) + ld de, UnknBGPals + ld hl, HousePalette + ld bc, 8 palettes + call FarCopyWRAM + ret +; 495ee + +HousePalette: ; 495ee +INCLUDE "tilesets/house_1.pal" +; 4962e + +LoadRadioTowerPalette: ; 4962e + ld a, BANK(UnknBGPals) + ld de, UnknBGPals + ld hl, RadioTowerPalette + ld bc, 8 palettes + call FarCopyWRAM + ret +; 4963d + +RadioTowerPalette: ; 4963d +INCLUDE "tilesets/radio_tower.pal" +; 4967d + +MansionPalette1: ; 4967d + RGB 30, 28, 26 + RGB 19, 19, 19 + RGB 13, 13, 13 + RGB 07, 07, 07 + + RGB 30, 28, 26 + RGB 31, 19, 24 + RGB 30, 10, 06 + RGB 07, 07, 07 + + RGB 18, 24, 09 + RGB 15, 20, 01 + RGB 09, 13, 00 + RGB 07, 07, 07 + + RGB 30, 28, 26 + RGB 15, 16, 31 + RGB 09, 09, 31 + RGB 07, 07, 07 + + RGB 30, 28, 26 + RGB 31, 31, 07 + RGB 31, 16, 01 + RGB 07, 07, 07 + + RGB 26, 24, 17 + RGB 21, 17, 07 + RGB 16, 13, 03 + RGB 07, 07, 07 + +MansionPalette3: ; 496ad + RGB 30, 28, 26 + RGB 17, 19, 31 + RGB 14, 16, 31 + RGB 07, 07, 07 + + RGB 31, 31, 16 + RGB 31, 31, 16 + RGB 14, 09, 00 + RGB 00, 00, 00 +; 496bd + +MansionPalette4: ; 496bd + RGB 05, 05, 16 + RGB 08, 19, 28 + RGB 00, 00, 00 + RGB 31, 31, 31 +; 496c5 + +LoadMansionPalette: ; 496c5 + ld a, BANK(UnknBGPals) + ld de, UnknBGPals + ld hl, MansionPalette1 + ld bc, 8 palettes + call FarCopyWRAM + ld a, BANK(UnknBGPals) + ld de, UnknBGPals palette PAL_BG_YELLOW + ld hl, MansionPalette2 + ld bc, 1 palettes + call FarCopyWRAM + ld a, BANK(UnknBGPals) + ld de, UnknBGPals palette PAL_BG_WATER + ld hl, MansionPalette3 + ld bc, 1 palettes + call FarCopyWRAM + ld a, BANK(UnknBGPals) + ld de, UnknBGPals palette PAL_BG_ROOF + ld hl, MansionPalette4 + ld bc, 1 palettes + call FarCopyWRAM + ret +; 496fe + +MansionPalette2: ; 496fe + RGB 25, 24, 23 + RGB 20, 19, 19 + RGB 14, 16, 31 + RGB 07, 07, 07 +; 49706 diff --git a/tilesets/unused_museum_palette_map.asm b/tilesets/unused_museum_palette_map.asm new file mode 100644 index 000000000..cfbe6dbcd --- /dev/null +++ b/tilesets/unused_museum_palette_map.asm @@ -0,0 +1,32 @@ +; Matches pokered's "gate" tileset (notable for its Pewter Museum tiles) +; https://tcrf.net/Pok%C3%A9mon_Gold_and_Silver#Unused_Tile_Palette_Assignment_Data + + tilepal 0, WATER, RED, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN + tilepal 0, BROWN, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, BROWN, BROWN, GRAY, BROWN, BROWN, ROOF + tilepal 0, ROOF, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, BROWN, BROWN, GRAY, BROWN, BROWN, ROOF + tilepal 0, ROOF, GRAY, ROOF, BROWN, ROOF, ROOF, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, ROOF + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, WATER, RED, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN + tilepal 1, BROWN, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, BROWN, BROWN, ROOF + tilepal 1, ROOF, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, BROWN, BROWN, GRAY, BROWN, BROWN, ROOF + tilepal 1, ROOF, GRAY, ROOF, BROWN, ROOF, ROOF, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, ROOF + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/tilesets/unused_palette_map_1.bin b/tilesets/unused_palette_map_1.bin deleted file mode 100644 index 04cb3ff2d..000000000 Binary files a/tilesets/unused_palette_map_1.bin and /dev/null differ diff --git a/tilesets/unused_palette_map_2.bin b/tilesets/unused_palette_map_2.bin deleted file mode 100644 index aba1b3cbf..000000000 --- a/tilesets/unused_palette_map_2.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/compare.sh b/tools/compare.sh similarity index 100% rename from compare.sh rename to tools/compare.sh diff --git a/compare2.sh b/tools/compare2.sh similarity index 100% rename from compare2.sh rename to tools/compare2.sh diff --git a/tools/toc.py b/tools/toc.py new file mode 100644 index 000000000..9bdc8cca6 --- /dev/null +++ b/tools/toc.py @@ -0,0 +1,89 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +""" +Usage: python3 toc.py [-n] files.md... +Replace a "## TOC" heading in a Markdown file with a table of contents, +generated from the other headings in the file. Supports multiple files. +Headings must start with "##" signs to be detected. +""" + +import sys +import re +from collections import namedtuple + +toc_name = 'Contents' +valid_toc_headings = {'## TOC', '##TOC'} + +TocItem = namedtuple('TocItem', ['name', 'anchor', 'level']) +punctuation_regexp = re.compile(r'[^\w\- ]+') + +def name_to_anchor(name): + # GitHub's algorithm for generating anchors from headings + # https://github.com/jch/html-pipeline/blob/master/lib/html/pipeline/toc_filter.rb + anchor = name.strip().lower() # lowercase + anchor = re.sub(punctuation_regexp, '', anchor) # remove punctuation + anchor = anchor.replace(' ', '-') # replace spaces with dash + return anchor + +def get_toc_index(lines): + toc_index = None + for i, line in enumerate(lines): + if line.rstrip() in valid_toc_headings: + toc_index = i + break + return toc_index + +def get_toc_items(lines, toc_index): + for i, line in enumerate(lines): + if i <= toc_index: + continue + if line.startswith('##'): + name = line.lstrip('#') + level = len(line) - len(name) - len('##') + name = name.strip() + anchor = name_to_anchor(name) + yield TocItem(name, anchor, level) + +def toc_string(toc_items): + lines = ['## %s' % toc_name, ''] + for name, anchor, level in toc_items: + padding = ' ' * level + line = '%s- [%s](#%s)' % (padding, name, anchor) + lines.append(line) + return '\n'.join(lines) + '\n' + +def add_toc(filename): + with open(filename, 'r', encoding='utf-8') as f: + lines = f.readlines() + toc_index = get_toc_index(lines) + if toc_index is None: + return None # no TOC heading + toc_items = list(get_toc_items(lines, toc_index)) + if not toc_items: + return False # no content headings + with open(filename, 'w', encoding='utf-8') as f: + for i, line in enumerate(lines): + if i == toc_index: + f.write(toc_string(toc_items)) + else: + f.write(line) + return True # OK + +def main(): + if len(sys.argv) < 2: + print('*** ERROR: No filenames specified') + print(__doc__) + exit(1) + for filename in sys.argv[1:]: + print(filename) + result = add_toc(filename) + if result is None: + print('*** WARNING: No "## TOC" heading found') + elif result is False: + print('*** WARNING: No content headings found') + else: + print('OK') + +if __name__ == '__main__': + main() diff --git a/wram.asm b/wram.asm index c58c76631..b9bae0e3e 100644 --- a/wram.asm +++ b/wram.asm @@ -168,7 +168,8 @@ wPlayerNextMovement:: db wPlayerMovement:: db ds 2 wc2e2:: -wMovementPerson:: db +wMovementPerson:: + db wMovementDataPointer:: ds 3 ; dba wc2e6:: ds 4 wMovementByteWasControlSwitch:: db @@ -330,11 +331,11 @@ SECTION "Battle", WRAM0 UNION ; c608 ; unidentified uses -wc608:: +wc608:: ds 480 NEXTU ; c608 ; miscellaneous -wMisc:: ds (SCREEN_WIDTH + 4) * (SCREEN_HEIGHT + 2) +wMisc:: ds WMISC_WIDTH * WMISC_HEIGHT wMiscEnd:: NEXTU ; c608 @@ -349,10 +350,11 @@ wBT_OTTemp:: battle_tower_struct wBT_OTTemp NEXTU ; c608 ; hall of fame temp struct - hall_of_fame wHallOfFameTemp +wHallOfFameTemp:: hall_of_fame wHallOfFameTemp NEXTU ; c608 ; timeset temp storage +wTimeSetBuffer:: ds 20 wInitHourBuffer:: db ; c61c ds 9 @@ -507,7 +509,8 @@ EnemyDamageTaken:: dw ; c684 wBattleReward:: ds 3 ; c686 wBattleAnimParam:: wKickCounter:: -wPresentPower:: db ; c689 +wPresentPower:: + db ; c689 BattleScriptBuffer:: ds 40 ; c68a BattleScriptBufferAddress:: dw ; c6b2 @@ -800,7 +803,7 @@ wUnownPuzzleEnd:: NEXTU ; c6d0 ; pokedex wPokedexDataStart:: -wPokedexOrder:: ds $100 ; NUM_POKEMON + 5 +wPokedexOrder:: ds $100 ; >= NUM_POKEMON wPokedexOrderEnd:: wPokedexMetadata:: wDexListingScrollOffset:: db ; offset of the first displayed entry from the start @@ -1266,14 +1269,16 @@ wcf5d:: dw MonType:: db ; cf5f CurSpecies:: -CurMove:: db ; cf60 +CurMove:: + db ; cf60 wNamedObjectTypeBuffer:: db ds 1 wBattleTowerBattleEnded:: -wJumptableIndex:: db +wJumptableIndex:: + db UNION ; cf64 ; unidentified @@ -1624,7 +1629,9 @@ wEarthquakeMovementDataBuffer:: ds 5 NEXTU ; d002 ; miscellaneous wTempDayOfWeek:: -wApricorns:: db +wApricorns:: + db + ds 2 StartFlypoint:: db @@ -1792,7 +1799,8 @@ wTMHMPocketScrollPosition:: db wSwitchMon:: wSwitchItem:: wMoveSwapBuffer:: -wd0e3:: ds 1 +wd0e3:: + db wMenuScrollPosition:: ds 4 @@ -1943,49 +1951,10 @@ MapEventHeaderPointer:: dw ; d1a6 ; bit set MapConnections:: db ; d1a8 -NorthMapConnection:: ; d1a9 -NorthConnectedMapGroup:: db ; d1a9 -NorthConnectedMapNumber:: db ; d1aa -NorthConnectionStripPointer:: dw ; d1ab -NorthConnectionStripLocation:: dw ; d1ad -NorthConnectionStripLength:: db ; d1af -NorthConnectedMapWidth:: db ; d1b0 -NorthConnectionStripYOffset:: db ; d1b1 -NorthConnectionStripXOffset:: db ; d1b2 -NorthConnectionWindow:: dw ; d1b3 - -SouthMapConnection:: ; d1b5 -SouthConnectedMapGroup:: db ; d1b5 -SouthConnectedMapNumber:: db ; d1b6 -SouthConnectionStripPointer:: dw ; d1b7 -SouthConnectionStripLocation:: dw ; d1b9 -SouthConnectionStripLength:: db ; d1bb -SouthConnectedMapWidth:: db ; d1bc -SouthConnectionStripYOffset:: db ; d1bd -SouthConnectionStripXOffset:: db ; d1be -SouthConnectionWindow:: dw ; d1bf - -WestMapConnection:: ; d1c1 -WestConnectedMapGroup:: db ; d1c1 -WestConnectedMapNumber:: db ; d1c2 -WestConnectionStripPointer:: dw ; d1c3 -WestConnectionStripLocation:: dw ; d1c5 -WestConnectionStripLength:: db ; d1c7 -WestConnectedMapWidth:: db ; d1c8 -WestConnectionStripYOffset:: db ; d1c9 -WestConnectionStripXOffset:: db ; d1ca -WestConnectionWindow:: dw ; d1cb - -EastMapConnection:: ; d1cd -EastConnectedMapGroup:: db ; d1cd -EastConnectedMapNumber:: db ; d1ce -EastConnectionStripPointer:: dw ; d1cf -EastConnectionStripLocation:: dw ; d1d1 -EastConnectionStripLength:: db ; d1d3 -EastConnectedMapWidth:: db ; d1d4 -EastConnectionStripYOffset:: db ; d1d5 -EastConnectionStripXOffset:: db ; d1d6 -EastConnectionWindow:: dw ; d1d7 +NorthMapConnection:: map_connection_struct North ; d1a9 +SouthMapConnection:: map_connection_struct South ; d1b5 +WestMapConnection:: map_connection_struct West ; d1c1 +EastMapConnection:: map_connection_struct East ; d1cd TilesetHeader:: TilesetBank:: db ; d1d9 @@ -2095,7 +2064,7 @@ UnownLetter:: db ; d234 wMoveSelectionMenuType:: db -; corresponds to the data/base_stats/*.asm contents +; corresponds to the data/pokemon/base_stats/*.asm contents CurBaseData:: ; d236 BaseDexNo:: db ; d236 BaseStats:: ; d237 @@ -2137,11 +2106,12 @@ wPutativeTMHMMove:: db wInitListType:: db wBattleHasJustStarted:: db -wFoundMatchingIDInParty:: wNamedObjectIndexBuffer:: wCurTMHM:: wTypeMatchup:: -wd265:: db +wFoundMatchingIDInParty:: +wd265:: + db wFailedToFlee:: db wNumFleeAttempts:: db @@ -2155,16 +2125,14 @@ TimeOfDay:: db ; d269 SECTION "Enemy Party", WRAMX UNION ; d26b -wPokedexShowPointerAddr:: -wd26b:: ds 1 -wd26c:: ds 1 -wPokedexShowPointerBank:: -wd26d:: ds 1 +wd26b:: +wPokedexShowPointerAddr:: dw +wPokedexShowPointerBank:: db ds 3 wd271:: ds 5 NEXTU ; d26b -; SECTION "Enemy Party", WRAMX +; enemy party OTPlayerName:: ds NAME_LENGTH ; d26b ENDU ; d276 @@ -2175,22 +2143,6 @@ OTPartySpecies:: ds PARTY_LENGTH ; d281 OTPartyEnd:: ds 1 ; legacy scripts don't check PartyCount UNION ; d288 -; catch tutorial dude pack -wDudeBag:: -wDudeNumItems:: db -wDudeItems:: ds 2 * 4 -wDudeItemsEnd:: db - -wDudeNumKeyItems:: db ; d292 -wDudeKeyItems:: ds 18 -wDudeKeyItemsEnd:: db - -wDudeNumBalls:: db ; d2a6 -wDudeBalls:: ds 2 * 4 ; d2a7 -wDudeBallsEnd:: db ; d2af -wDudeBagEnd:: - -NEXTU ; d288 ; ot party mons OTPartyMons:: OTPartyMon1:: party_struct OTPartyMon1 ; d288 @@ -2205,6 +2157,22 @@ OTPartyMonOT:: ds NAME_LENGTH * PARTY_LENGTH ; d3a8 OTPartyMonNicknames:: ds PKMN_NAME_LENGTH * PARTY_LENGTH ; d3ea OTPartyDataEnd:: ds 4 + +NEXTU ; d288 +; catch tutorial dude pack +wDudeBag:: +wDudeNumItems:: db +wDudeItems:: ds 2 * 4 +wDudeItemsEnd:: db + +wDudeNumKeyItems:: db ; d292 +wDudeKeyItems:: ds 18 +wDudeKeyItemsEnd:: db + +wDudeNumBalls:: db ; d2a6 +wDudeBalls:: ds 2 * 4 ; d2a7 +wDudeBallsEnd:: db ; d2af +wDudeBagEnd:: ENDU ; d430 wd430:: @@ -2241,9 +2209,11 @@ wScriptStack:: ds 3 * 5 ScriptDelay:: db ; d44d wPriorityScriptBank:: -wScriptTextBank:: db ; d44e +wScriptTextBank:: + db ; d44e wPriorityScriptAddr:: -wScriptTextAddr:: dw ; d44f +wScriptTextAddr:: + dw ; d44f ds 1 wWildEncounterCooldown:: db ; d452 wXYComparePointer:: dw ; d453 @@ -2456,9 +2426,7 @@ FarfetchdPosition:: db ; d964 ds 13 - -;SECTION "Map Triggers", WRAMX - +; map triggers wPokecenter2FTrigger:: db ; d972 wTradeCenterTrigger:: db ; d973 wColosseumTrigger:: db ; d974 @@ -2541,9 +2509,7 @@ wMobileBattleRoomTrigger:: db ; d9c0 ds 49 - -;SECTION "Events", WRAMX - +; fight counts wJackFightCount:: db ; d9f2 wBeverlyFightCount:: db ; unused wHueyFightCount:: db @@ -2573,6 +2539,7 @@ wKenjiFightCount:: db ; unused wParryFightCount:: db wErinFightCount:: db ; da0e + ds 100 EventFlags:: flag_array NUM_EVENTS ; da72 @@ -2744,7 +2711,6 @@ PartyMonNicknamesEnd:: ds 22 - PokedexCaught:: flag_array NUM_POKEMON ; de99 EndPokedexCaught:: @@ -2803,12 +2769,14 @@ wRoamMons_CurrentMapNumber:: db wRoamMons_CurrentMapGroup:: db wRoamMons_LastMapNumber:: db wRoamMons_LastMapGroup:: db + wBestMagikarpLengthFeet:: db wBestMagikarpLengthInches:: db wMagikarpRecordHoldersName:: ds NAME_LENGTH -; dff5 + wPokemonDataEnd:: wGameDataEnd:: +; dff5 SECTION "Pic Animations", WRAMX @@ -2855,41 +2823,37 @@ SECTION "Battle Tower", WRAMX w3_d000:: ds 1 ; d000 w3_d001:: ds 1 -w3_d002:: - ds $7e -w3_d080:: - ds $10 -w3_d090:: - ds $70 +w3_d002:: ds $7e +w3_d080:: ds $10 +w3_d090:: ds $70 -w3_d100:: ; BattleTower OpponentTrainer-Data (length = 0xe0 = $a + $1 + 3*$3b + $24) +w3_d100:: BT_OTTrainer:: battle_tower_struct BT_OT -; d1e0 ds $20 -; d200 -BT_TrainerTextIndex:: ds 2 +BT_TrainerTextIndex:: db ; d200 + ds 1 w3_d202:: battle_tower_struct w3_d202 w3_d2e2:: battle_tower_struct w3_d2e2 w3_d3c2:: battle_tower_struct w3_d3c2 w3_d4a2:: battle_tower_struct w3_d4a2 w3_d582:: battle_tower_struct w3_d582 w3_d662:: battle_tower_struct w3_d662 + UNION ; d742 w3_d742:: battle_tower_struct w3_d742 ; d822 NEXTU ; d742 ds $be +w3_d800:: ds BG_MAP_WIDTH * SCREEN_HEIGHT -wBTChoiceOfLvlGroup:: -w3_d800:: ; ds BG_MAP_WIDTH * SCREEN_HEIGHT ($240) - ds $69 -ENDU ; d869 +NEXTU ; d742 + ds $be +wBTChoiceOfLvlGroup:: db + ds $68 w3_d869:: ds $17 w3_d880:: ds 1 -w3_d881:: ds 1 -w3_d882:: ds 1 -w3_d883:: ds 7 +w3_d881:: ds 9 w3_d88a:: ds 5 w3_d88f:: ds 5 w3_d894:: ds 1 @@ -2897,12 +2861,16 @@ w3_d895:: ds 11 w3_d8a0:: ds 1 w3_d8a1:: ds 1 w3_d8a2:: ds 1 -w3_d8a3:: ds $19d -w3_da40:: ds $1c0 +w3_d8a3:: ds 1 +ENDU ; d8a4 + + ds $1c0 w3_dc00:: ds SCREEN_WIDTH * SCREEN_HEIGHT w3_dd68:: ds SCREEN_WIDTH * SCREEN_HEIGHT + ds $11c + w3_dfec:: ds $10 w3_dffc:: ds 4 @@ -2967,31 +2935,38 @@ BattleAnimLoops:: db ; d415 BattleAnimVar:: db ; d416 BattleAnimByte:: db ; d417 wBattleAnimOAMPointerLo:: db ; d418 -BattleAnimTemps:: ; d419 -wBattleAnimTempOAMFlags:: + +UNION ; d419 +; unidentified wBattleAnimTemp0:: db wBattleAnimTemp1:: db -wBattleAnimTempTileID:: wBattleAnimTemp2:: db -wBattleAnimTempXCoord:: wBattleAnimTemp3:: db -wBattleAnimTempYCoord:: wBattleAnimTemp4:: db -wBattleAnimTempXOffset:: wBattleAnimTemp5:: db -wBattleAnimTempYOffset:: wBattleAnimTemp6:: db wBattleAnimTemp7:: db -wBattleAnimTempPalette:: wBattleAnimTemp8:: db -UNION ; d422 -wSurfWaveBGEffect:: ds $40 -wSurfWaveBGEffectEnd:: +NEXTU ; d419 +wBattleAnimTempOAMFlags:: db + ds 1 +wBattleAnimTempTileID:: db +wBattleAnimTempXCoord:: db +wBattleAnimTempYCoord:: db +wBattleAnimTempXOffset:: db +wBattleAnimTempYOffset:: db + ds 1 +wBattleAnimTempPalette:: db +ENDU ; d422 -NEXTU ; d422 +UNION ; d422 ds $32 wBattleAnimEnd:: + +NEXTU ; d422 +wSurfWaveBGEffect:: ds $40 +wSurfWaveBGEffectEnd:: ENDU ; d462