diff options
| author | einstein95 <einstein95@users.noreply.github.com> | 2017-08-10 00:43:16 +1200 |
|---|---|---|
| committer | einstein95 <einstein95@users.noreply.github.com> | 2017-08-10 00:43:16 +1200 |
| commit | a5e8fc7dfcb2ec286ba28f89a2116f2f4a36d80a (patch) | |
| tree | 680bdaed164fc3eba910e7aba571d26eae3bfec3 | |
| parent | 82267acc6938eda87c89e720c7dbce364b252223 (diff) | |
| parent | a1ca8aa239837496f98e54c7c246fd9fb9c8a5e3 (diff) | |
Update to latest pokered
29 files changed, 125 insertions, 127 deletions
@@ -2,8 +2,9 @@ sudo apt-get install make gcc bison git python - git clone https://github.com/bentley/rgbds + git clone https://github.com/rednex/rgbds cd rgbds + git checkout v0.2.5 sudo make install cd .. @@ -26,8 +27,9 @@ In **Terminal**, run: xcode-select --install - git clone https://github.com/bentley/rgbds + git clone https://github.com/rednex/rgbds cd rgbds + git checkout v0.2.5 sudo make install cd .. @@ -43,8 +45,8 @@ To build on Windows, use [**Cygwin**](http://cygwin.com/install.html). Use the d In the installer, select the following packages: `make` `git` `python` `gettext` -Then get the most recent version of [**rgbds**](https://github.com/bentley/rgbds/releases/). -Extract the archive and put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin\usr\local\bin`. +Then get [**rgbds 0.2.5**](https://github.com/bentley/rgbds/releases/tag/v0.2.5). +Extract the archive and put `rgbasm.exe`, `rgblink.exe`, `rgbfix.exe` and `rgbgfx.exe` in `C:\cygwin\usr\local\bin`. If your Cygwin installation directory differs, ensure the `bin` directory is present in the PATH variable. In the **Cygwin terminal**: @@ -6,29 +6,29 @@ AUDIO_3 EQU $1f INCLUDE "constants.asm" -SECTION "Sound Effect Headers 1", ROMX[$4000], BANK[AUDIO_1] +SECTION "Sound Effect Headers 1", ROMX, BANK[AUDIO_1] INCLUDE "audio/headers/sfxheaders1.asm" -SECTION "Sound Effect Headers 2", ROMX[$4000], BANK[AUDIO_2] +SECTION "Sound Effect Headers 2", ROMX, BANK[AUDIO_2] INCLUDE "audio/headers/sfxheaders2.asm" -SECTION "Sound Effect Headers 3", ROMX[$4000], BANK[AUDIO_3] +SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3] INCLUDE "audio/headers/sfxheaders3.asm" -SECTION "Music Headers 1", ROMX[$422E], BANK[AUDIO_1] +SECTION "Music Headers 1", ROMX, BANK[AUDIO_1] INCLUDE "audio/headers/musicheaders1.asm" -SECTION "Music Headers 2", ROMX[$42BE], BANK[AUDIO_2] +SECTION "Music Headers 2", ROMX, BANK[AUDIO_2] INCLUDE "audio/headers/musicheaders2.asm" -SECTION "Music Headers 3", ROMX[$4249], BANK[AUDIO_3] +SECTION "Music Headers 3", ROMX, BANK[AUDIO_3] INCLUDE "audio/headers/musicheaders3.asm" -SECTION "Sound Effects 1", ROMX[$42FD], BANK[AUDIO_1] +SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1] INCLUDE "audio/sfx/snare1_1.asm" INCLUDE "audio/sfx/snare2_1.asm" @@ -630,7 +630,7 @@ INCLUDE "audio/music/gym.asm" INCLUDE "audio/music/pokecenter.asm" -SECTION "Music 2", ROMX[$632D], BANK[AUDIO_2] +SECTION "Music 2", ROMX, BANK[AUDIO_2] INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm" INCLUDE "audio/sfx/unused2_2.asm" @@ -646,7 +646,7 @@ INCLUDE "audio/music/defeatedwildmon.asm" INCLUDE "audio/music/defeatedgymleader.asm" -SECTION "Music 3", ROMX[$5BBB], BANK[AUDIO_3] +SECTION "Music 3", ROMX, BANK[AUDIO_3] INCLUDE "audio/music/bikeriding.asm" INCLUDE "audio/music/dungeon1.asm" diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm index 21a3ad93..d6af3584 100644 --- a/constants/hardware_constants.asm +++ b/constants/hardware_constants.asm @@ -68,7 +68,7 @@ rNR34 EQU $ff1e ; Channel 3 Frequency's higher data (R/W) rNR41 EQU $ff20 ; Channel 4 Sound Length (R/W) rNR42 EQU $ff21 ; Channel 4 Volume Envelope (R/W) rNR43 EQU $ff22 ; Channel 4 Polynomial Counter (R/W) -rNR44 EQU $ff23 ; Channel 4 Counter/consecutive; Inital (R/W) +rNR44 EQU $ff23 ; Channel 4 Counter/consecutive; Initial (R/W) rNR50 EQU $ff24 ; Channel control / ON-OFF / Volume (R/W) rNR51 EQU $ff25 ; Selection of Sound output terminal (R/W) rNR52 EQU $ff26 ; Sound on/off diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 57b19a37..d4f231b5 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -120,7 +120,7 @@ TMHM_PARTY_MENU EQU 3 SWAP_MONS_PARTY_MENU EQU 4 EVO_STONE_PARTY_MENU EQU 5 -; party memu message IDs +; party menu message IDs ANTIDOTE_MSG EQU $F0 BURN_HEAL_MSG EQU $F1 ICE_HEAL_MSG EQU $F2 diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 57ad230d..5eb05b61 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -194,7 +194,7 @@ ENDM music_const SFX_SAVE, SFX_Save_1 ; AUDIO_1 - music_const SFX_POKEFLUE, SFX_Pokeflute + music_const SFX_POKEFLUTE, SFX_Pokeflute music_const SFX_SAFARI_ZONE_PA, SFX_Safari_Zone_PA ; AUDIO_2 diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index 0c586dad..da4f80c9 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -391,18 +391,18 @@ JugglerData: db 29,KADABRA,MR_MIME,0 ; Victory Road 2F db 41,DROWZEE,HYPNO,KADABRA,KADABRA,0 -; Fucshia Gym +; Fuchsia Gym db 31,DROWZEE,DROWZEE,KADABRA,DROWZEE,0 db 34,DROWZEE,HYPNO,0 ; Victory Road 2F db 48,MR_MIME,0 ; Unused db 33,HYPNO,0 -; Fucshia Gym +; Fuchsia Gym db 38,HYPNO,0 db 34,DROWZEE,KADABRA,0 TamerData: -; Fucshia Gym +; Fuchsia Gym db 34,SANDSLASH,ARBOK,0 db 33,ARBOK,SANDSLASH,ARBOK,0 ; Viridian Gym diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 373136a8..4964b2cf 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -829,7 +829,7 @@ DoRockSlideSpecialEffects: cp a,1 jp z,AnimationFlashScreen ; if it's the end of the subanimation, flash the screen ret -; if the subaninmation counter is between 8 and 11, shake the screen horizontally and vertically +; if the subanimation counter is between 8 and 11, shake the screen horizontally and vertically .shakeScreen ld b,1 predef PredefShakeScreenHorizontally ; shake horizontally @@ -1516,7 +1516,7 @@ AnimationShowMonPic: jp Delay3 AnimationShowEnemyMonPic: -; Shows the emenmy mon's front sprite. Used in animations like Seismic Toss +; Shows the enemy mon's front sprite. Used in animations like Seismic Toss ; to make the mon's sprite reappear after disappears offscreen. ld hl, AnimationShowMonPic jp CallWithTurnFlipped diff --git a/engine/battle/core.asm b/engine/battle/core.asm index a80da1af..afbbf8b9 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -406,7 +406,7 @@ MainInBattleLoop: ld a, [wEnemyBattleStatus1] bit UsingTrappingMove, a ; check if enemy is using a multi-turn attack like wrap jr z, .selectPlayerMove ; if not, jump -; enemy is using a mult-turn attack like wrap, so player is trapped and cannot execute a move +; enemy is using a multi-turn attack like wrap, so player is trapped and cannot execute a move ld a, $ff ld [wPlayerSelectedMove], a jr .selectEnemyMove @@ -704,7 +704,7 @@ HandlePoisonBurnLeechSeed_DecreaseOwnHP: ret ; adds bc to enemy HP -; bc isn't updated if HP substracted was capped to prevent overkill +; bc isn't updated if HP subtracted was capped to prevent overkill HandlePoisonBurnLeechSeed_IncreaseEnemyHP: push hl ld hl, wEnemyMonMaxHP @@ -1218,7 +1218,7 @@ ChooseNextMon: ret ; called when player is out of usable mons. -; prints approriate lose message, sets carry flag if player blacked out (special case for initial rival fight) +; prints appropriate lose message, sets carry flag if player blacked out (special case for initial rival fight) HandlePlayerBlackOut: ld a, [wLinkState] cp LINK_STATE_BATTLING @@ -3551,7 +3551,7 @@ CheckPlayerStatusConditions: ld c,[hl] ld hl,wPlayerBideAccumulatedDamage + 1 ld a,[hl] - add c ; acumulate damage taken + add c ; accumulate damage taken ld [hld],a ld a,[hl] adc b @@ -4287,7 +4287,7 @@ GetDamageVarsForPlayerAttack: sla c rl b ; reflect and light screen boosts do not cap the stat at 999, so weird things will happen during stats scaling if -; a Pokemon with 512 or more Defense has ued Reflect, or if a Pokemon with 512 or more Special has used Light Screen +; a Pokemon with 512 or more Defense has used Reflect, or if a Pokemon with 512 or more Special has used Light Screen .specialAttackCritCheck ld hl, wBattleMonSpecial ld a, [wCriticalHitOrOHKO] @@ -4400,7 +4400,7 @@ GetDamageVarsForEnemyAttack: sla c rl b ; reflect and light screen boosts do not cap the stat at 999, so weird things will happen during stats scaling if -; a Pokemon with 512 or more Defense has ued Reflect, or if a Pokemon with 512 or more Special has used Light Screen +; a Pokemon with 512 or more Defense has used Reflect, or if a Pokemon with 512 or more Special has used Light Screen .specialAttackCritCheck ld hl, wEnemyMonSpecial ld a, [wCriticalHitOrOHKO] @@ -7292,16 +7292,16 @@ PoisonEffect: ld de, wEnemyMoveEffect .poisonEffect call CheckTargetSubstitute - jr nz, .noEffect ; can't posion a substitute target + jr nz, .noEffect ; can't poison a substitute target ld a, [hli] ld b, a and a jr nz, .noEffect ; miss if target is already statused ld a, [hli] - cp POISON ; can't posion a poison-type target + cp POISON ; can't poison a poison-type target jr z, .noEffect ld a, [hld] - cp POISON ; can't posion a poison-type target + cp POISON ; can't poison a poison-type target jr z, .noEffect ld a, [de] cp POISON_SIDE_EFFECT1 @@ -7781,7 +7781,7 @@ StatModifierDownEffect: jp nz, MoveMissed ld a, [de] sub ATTACK_DOWN1_EFFECT - cp EVASION_DOWN1_EFFECT + $3 - ATTACK_DOWN1_EFFECT ; covers al -1 effects + cp EVASION_DOWN1_EFFECT + $3 - ATTACK_DOWN1_EFFECT ; covers all -1 effects jr c, .decrementStatMod sub ATTACK_DOWN2_EFFECT - ATTACK_DOWN1_EFFECT ; map -2 effects to corresponding -1 effect .decrementStatMod diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index f44d64f5..323dd167 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -186,7 +186,7 @@ SetupPlayerAndEnemyPokeballs: ld hl, wOAMBuffer + $18 jp WritePokeballOAMData -; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (faited) and pokeball slot (no mon) +; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (fainted) and pokeball slot (no mon) PokeballTileGraphics:: INCBIN "gfx/pokeball.2bpp" PokeballTileGraphicsEnd: diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/moveEffects/heal_effect.asm index b7d8283f..2e68acc0 100644 --- a/engine/battle/moveEffects/heal_effect.asm +++ b/engine/battle/moveEffects/heal_effect.asm @@ -76,7 +76,7 @@ HealEffect_: ld a, [de] sbc [hl] jr c, .playAnim -; copy max HP to current HP if an overflow ocurred +; copy max HP to current HP if an overflow occurred ld a, [hli] ld [de], a ld [wHPBarNewHP+1], a diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/moveEffects/recoil_effect.asm index 7fc90c44..0f2f087b 100644 --- a/engine/battle/moveEffects/recoil_effect.asm +++ b/engine/battle/moveEffects/recoil_effect.asm @@ -25,7 +25,7 @@ RecoilEffect_: jr nz, .updateHP inc c ; minimum recoil damage is 1 .updateHP -; substract HP from user due to the recoil damage +; subtract HP from user due to the recoil damage ld a, [hli] ld [wHPBarMaxHP+1], a ld a, [hl] diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/moveEffects/substitute_effect.asm index 03314ebf..6cca3eae 100644 --- a/engine/battle/moveEffects/substitute_effect.asm +++ b/engine/battle/moveEffects/substitute_effect.asm @@ -37,9 +37,9 @@ SubstituteEffect_: sbc 0 pop bc jr c, .notEnoughHP ; underflow means user would be left with negative health - ; bug: since it only brances on carry, it will possibly leave user with 0 HP + ; bug: since it only branches on carry, it will possibly leave user with 0 HP .userHasZeroOrMoreHP - ldi [hl], a ; save resulting HP after substraction into current HP + ldi [hl], a ; save resulting HP after subtraction into current HP ld [hl], d ld h, b ld l, c diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index b175fcaf..cabd4334 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -114,7 +114,7 @@ AIMoveChoiceModification1: ld a, [wBattleMonStatus] and a ret z ; return if no status ailment on player's mon - ld hl, wBuffer - 1 ; temp move selection array (-1 byte offest) + ld hl, wBuffer - 1 ; temp move selection array (-1 byte offset) ld de, wEnemyMonMoves ; enemy moves ld b, NUM_MOVES + 1 .nextMove @@ -154,7 +154,7 @@ StatusAilmentMoveEffects: ; slightly encourage moves with specific effects. ; in particular, stat-modifying moves and other move effects -; that fall in-bewteen +; that fall in-between AIMoveChoiceModification2: ld a, [wAILayer2Encouragement] cp $1 @@ -212,7 +212,7 @@ AIMoveChoiceModification3: cp $10 jr z, .nextMove jr c, .notEffectiveMove - dec [hl] ; sligthly encourage this move + dec [hl] ; slightly encourage this move jr .nextMove .notEffectiveMove ; discourages non-effective moves if better moves are available push hl @@ -253,7 +253,7 @@ AIMoveChoiceModification3: pop hl and a jr z, .nextMove - inc [hl] ; sligthly discourage this move + inc [hl] ; slightly discourage this move jr .nextMove AIMoveChoiceModification4: ret diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index f7c45222..bc490e3c 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -54,7 +54,7 @@ KabutopsFossilText: DisplayMonFrontSpriteInBox: ; Displays a pokemon's front sprite in a pop-up window. -; [wcf91] = pokemon interal id number +; [wcf91] = pokemon internal id number ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 diff --git a/engine/items/items.asm b/engine/items/items.asm index 07c20534..65115fed 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -863,7 +863,7 @@ ItemUseMedicine: jp nc,.useVitamin ; if it's a vitamin or Rare Candy cp a,FULL_RESTORE jr nc,.healHP ; if it's a Full Restore or one of the potions -; fall through if it's one of the status-specifc healing items +; fall through if it's one of the status-specific healing items .cureStatusAilment ld bc,wPartyMon1Status - wPartyMon1 add hl,bc ; hl now points to status @@ -1846,12 +1846,12 @@ PlayedFluteHadEffectText: ; play out-of-battle pokeflute music ld a,$ff call PlaySound ; turn off music - ld a, SFX_POKEFLUE + ld a, SFX_POKEFLUTE ld c, BANK(SFX_Pokeflute) call PlayMusic .musicWaitLoop ; wait for music to finish playing ld a,[wChannelSoundIDs + Ch2] - cp a, SFX_POKEFLUE + cp a, SFX_POKEFLUTE jr z,.musicWaitLoop call PlayDefaultMusic ; start playing normal music again .done diff --git a/engine/learn_move.asm b/engine/learn_move.asm index 1eda3a60..8dd72cd8 100755 --- a/engine/learn_move.asm +++ b/engine/learn_move.asm @@ -185,7 +185,7 @@ TryingToLearn: LearnedMove1Text: TX_FAR _LearnedMove1Text - TX_SFX_ITEM_1 ; plays SFX_GET_ITEM_1 in the pary menu (rare candy) and plays SFX_LEVEL_UP in battle + TX_SFX_ITEM_1 ; plays SFX_GET_ITEM_1 in the party menu (rare candy) and plays SFX_LEVEL_UP in battle TX_BLINK db "@" diff --git a/engine/menu/draw_start_menu.asm b/engine/menu/draw_start_menu.asm index e8609cd8..5e10b972 100644 --- a/engine/menu/draw_start_menu.asm +++ b/engine/menu/draw_start_menu.asm @@ -27,7 +27,7 @@ DrawStartMenu: set 6,[hl] ; no pauses between printing each letter coord hl, 12, 2 CheckEvent EVENT_GOT_POKEDEX -; case for not having pokdex +; case for not having pokedex ld a,$06 jr z,.storeMenuItemCount ; case for having pokedex diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 34abac05..a3c2c72a 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -412,7 +412,7 @@ PrintNicknameAndUnderscores: call EraseMenuCursor ld a, $11 ; "ED" x coord ld [wTopMenuItemX], a - ld a, $5 ; "ED" y corrd + ld a, $5 ; "ED" y coord ld [wCurrentMenuItem], a ld a, [wNamingScreenType] cp NAME_MON_SCREEN diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 9e13b869..ea28c133 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -648,7 +648,7 @@ PokedexToIndex: ret IndexToPokedex: - ; converts the indexédex number at wd11e to a Pokédex number + ; converts the index number at wd11e to a Pokédex number push bc push hl ld a,[wd11e] diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index 05588321..2a221c7e 100755 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -7,7 +7,7 @@ ; $C1X* and $C2X* are used to denote wSpriteStateData1-wSpriteStateData1 + $ff and wSpriteStateData2 + $00-wSpriteStateData2 + $ff sprite slot ; fields, respectively, within loops. The X is the loop index. ; If there is an inner loop, Y is the inner loop index, i.e. $C1Y* and $C2Y* -; denote fields of the sprite slots interated over in the inner loop. +; denote fields of the sprite slots iterated over in the inner loop. InitMapSprites: call InitOutsideMapSprites ret c ; return if the map is an outside map (already handled by above call) @@ -192,7 +192,7 @@ LoadMapSpriteTilePatterns: pop de call FarCopyData2 ; load tile pattern data for sprite when walking jr .skipSecondLoad -; When reloading the upper half of tile patterns after diplaying text, the LCD +; When reloading the upper half of tile patterns after displaying text, the LCD ; will be on, so CopyVideoData (which writes to VRAM only during V-blank) must ; be used instead of FarCopyData2. .loadWhileLCDOn diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index e2003d12..3b351e58 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -331,9 +331,9 @@ UpdateSpriteInWalkingAnimation: ld a, [H_CURRENTSPRITEOFFSET] ld l, a inc h - ld a, [hl] ; c2x0 (walk animantion counter) + ld a, [hl] ; c2x0 (walk animation counter) dec a - ld [hl], a ; update walk animantion counter + ld [hl], a ; update walk animation counter ret nz ld a, $6 ; walking finished, update state add l @@ -447,7 +447,7 @@ InitializeSpriteStatus: call InitializeSpriteScreenPosition ; could have done fallthrough here ret -; calculates the spprite's scrren position form its map position and the player position +; calculates the sprite's screen position form its map position and the player position InitializeSpriteScreenPosition: ld h, wSpriteStateData2 / $100 ld a, [H_CURRENTSPRITEOFFSET] @@ -698,7 +698,7 @@ CanWalkOntoTile: scf ; set carry (marking failure to walk) ret -; calculates the tile pointer pointing to the tile the current sprite stancs on +; calculates the tile pointer pointing to the tile the current sprite stands on ; this is always the lower left tile of the 2x2 tile blocks all sprites are snapped to ; hl: output pointer GetTileSpriteStandsOn: @@ -30,7 +30,7 @@ SECTION "joypad", ROM0 [$60] reti -SECTION "Home", ROM0 [$61] +SECTION "Home", ROM0 DisableLCD:: xor a @@ -99,7 +99,7 @@ SECTION "Header", ROM0 [$104] -SECTION "Main", ROM0 [$150] +SECTION "Main", ROM0 Start:: cp GBC @@ -2094,7 +2094,7 @@ DisableWaitingAfterTextDisplay:: ; [wcf91] = item ID ; OUTPUT: ; [wActionResultOrTookBattleTurn] = success -; 00: unsucessful +; 00: unsuccessful ; 01: successful ; 02: not able to be used right now, no extra menu displayed (only certain items use this) UseItem:: @@ -3393,7 +3393,7 @@ CopyString:: ; this function is used when lower button sensitivity is wanted (e.g. menus) ; OUTPUT: [hJoy5] = pressed buttons in usual format ; there are two flags that control its functionality, [hJoy6] and [hJoy7] -; there are esentially three modes of operation +; there are essentially three modes of operation ; 1. Get newly pressed buttons only ; ([hJoy7] == 0, [hJoy6] == any) ; Just copies [hJoyPressed] to [hJoy5]. @@ -3741,7 +3741,7 @@ CalcStat:: ld a, b add e jr nc, .noCarry2 - inc d ; da = (Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4 + inc d ; de = (Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4 .noCarry2 ld [H_MULTIPLICAND+2], a ld a, d @@ -98,7 +98,7 @@ hSwapTemp EQU $FF95 hExperience EQU $FF96 ; 3 bytes, big endian -; Multiplcation and division variables are meant +; Multiplication and division variables are meant ; to overlap for back-to-back usage. Big endian. H_MULTIPLICAND EQU $FF96 ; 3 bytes diff --git a/macros/data_macros.asm b/macros/data_macros.asm index e24ae20e..4c6457be 100755 --- a/macros/data_macros.asm +++ b/macros/data_macros.asm @@ -146,7 +146,7 @@ ENDM ;\6 (flag) = add 3 to width of connection strip (why?) SOUTH_MAP_CONNECTION: MACRO db \2 ; map id - dw \5 + \4 ; "Conection Strip" location + dw \5 + \4 ; "Connection Strip" location dw wOverworldMap + 3 + (\1_HEIGHT + 3) * (\1_WIDTH + 6) + \3 ; current map position IF (\1_WIDTH < \2_WIDTH) IF (_NARG > 5) @@ -14,7 +14,7 @@ PICS_5 EQU $D INCLUDE "home.asm" -SECTION "bank1",ROMX[$4000],BANK[$1] +SECTION "bank1",ROMX,BANK[$1] INCLUDE "data/facing.asm" @@ -127,7 +127,7 @@ INCLUDE "engine/pathfinding.asm" INCLUDE "engine/hp_bar.asm" INCLUDE "engine/hidden_object_functions3.asm" -SECTION "NPC Sprites 1", ROMX[$4000], BANK[NPC_SPRITES_1] +SECTION "NPC Sprites 1", ROMX, BANK[NPC_SPRITES_1] OakAideSprite: INCBIN "gfx/sprites/oak_aide.2bpp" RockerSprite: INCBIN "gfx/sprites/rocker.2bpp" @@ -158,7 +158,7 @@ OldAmberSprite: INCBIN "gfx/sprites/old_amber.2bpp" LyingOldManSprite: INCBIN "gfx/sprites/lying_old_man.2bpp" -SECTION "Graphics", ROMX[$5380], BANK[GFX] +SECTION "Graphics", ROMX, BANK[GFX] PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.2bpp" FontGraphics: INCBIN "gfx/font.1bpp" @@ -186,7 +186,7 @@ PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp" PlayerCharacterTitleGraphicsEnd: -SECTION "Battle (bank 4)", ROMX[$68E8], BANK[$4] +SECTION "Battle (bank 4)", ROMX, BANK[$4] INCLUDE "engine/overworld/is_player_just_outside_map.asm" INCLUDE "engine/menu/status_screen.asm" @@ -208,7 +208,7 @@ INCLUDE "engine/battle/get_trainer_name.asm" INCLUDE "engine/random.asm" -SECTION "NPC Sprites 2", ROMX[$4000], BANK[NPC_SPRITES_2] +SECTION "NPC Sprites 2", ROMX, BANK[NPC_SPRITES_2] RedCyclingSprite: INCBIN "gfx/sprites/cycling.2bpp" RedSprite: INCBIN "gfx/sprites/red.2bpp" @@ -252,7 +252,7 @@ LoreleiSprite: INCBIN "gfx/sprites/lorelei.2bpp" SeelSprite: INCBIN "gfx/sprites/seel.2bpp" -SECTION "Battle (bank 5)", ROMX[$7840], BANK[$5] +SECTION "Battle (bank 5)", ROMX, BANK[$5] INCLUDE "engine/load_pokedex_tiles.asm" INCLUDE "engine/overworld/map_sprites.asm" @@ -262,7 +262,7 @@ INCLUDE "engine/battle/moveEffects/substitute_effect.asm" INCLUDE "engine/menu/pc.asm" -SECTION "bank6",ROMX[$4000],BANK[$6] +SECTION "bank6",ROMX,BANK[$6] INCLUDE "data/mapHeaders/celadoncity.asm" INCLUDE "data/mapObjects/celadoncity.asm" @@ -337,7 +337,7 @@ INCLUDE "engine/overworld/doors.asm" INCLUDE "engine/overworld/ledges.asm" -SECTION "bank7",ROMX[$4000],BANK[$7] +SECTION "bank7",ROMX,BANK[$7] INCLUDE "data/mapHeaders/cinnabarisland.asm" INCLUDE "data/mapObjects/cinnabarisland.asm" @@ -518,7 +518,7 @@ INCLUDE "engine/menu/oaks_pc.asm" INCLUDE "engine/hidden_object_functions7.asm" -SECTION "Pics 1", ROMX[$4000], BANK[PICS_1] +SECTION "Pics 1", ROMX, BANK[PICS_1] RhydonPicFront:: INCBIN "pic/bmon/rhydon.pic" RhydonPicBack:: INCBIN "pic/monback/rhydonb.pic" @@ -580,13 +580,13 @@ TangelaPicFront:: INCBIN "pic/bmon/tangela.pic" TangelaPicBack:: INCBIN "pic/monback/tangelab.pic" -SECTION "Battle (bank 9)", ROMX[$7D6B], BANK[$9] +SECTION "Battle (bank 9)", ROMX, BANK[$9] INCLUDE "engine/battle/print_type.asm" INCLUDE "engine/battle/save_trainer_name.asm" INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm" -SECTION "Pics 2", ROMX[$4000], BANK[PICS_2] +SECTION "Pics 2", ROMX, BANK[PICS_2] GrowlithePicFront:: INCBIN "pic/bmon/growlithe.pic" GrowlithePicBack:: INCBIN "pic/monback/growlitheb.pic" @@ -654,11 +654,11 @@ MoltresPicFront:: INCBIN "pic/bmon/moltres.pic" MoltresPicBack:: INCBIN "pic/monback/moltresb.pic" -SECTION "Battle (bank A)", ROMX[$7EA9], BANK[$A] +SECTION "Battle (bank A)", ROMX, BANK[$A] INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" -SECTION "Pics 3", ROMX[$4000], BANK[PICS_3] +SECTION "Pics 3", ROMX, BANK[PICS_3] ArticunoPicFront:: INCBIN "pic/bmon/articuno.pic" ArticunoPicBack:: INCBIN "pic/monback/articunob.pic" @@ -732,7 +732,7 @@ BeedrillPicBack:: INCBIN "pic/monback/beedrillb.pic" FossilKabutopsPic:: INCBIN "pic/bmon/fossilkabutops.pic" -SECTION "Battle (bank B)", ROMX[$7B7B], BANK[$B] +SECTION "Battle (bank B)", ROMX, BANK[$B] INCLUDE "engine/battle/display_effectiveness.asm" @@ -748,7 +748,7 @@ INCLUDE "engine/battle/moveEffects/pay_day_effect.asm" INCLUDE "engine/game_corner_slots2.asm" -SECTION "Pics 4", ROMX[$4000], BANK[PICS_4] +SECTION "Pics 4", ROMX, BANK[PICS_4] DodrioPicFront:: INCBIN "pic/bmon/dodrio.pic" DodrioPicBack:: INCBIN "pic/monback/dodriob.pic" @@ -813,12 +813,12 @@ RedPicBack:: INCBIN "pic/trainer/redb.pic" OldManPic:: INCBIN "pic/trainer/oldman.pic" -SECTION "Battle (bank C)", ROMX[$7F2B], BANK[$C] +SECTION "Battle (bank C)", ROMX, BANK[$C] INCLUDE "engine/battle/moveEffects/mist_effect.asm" INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm" -SECTION "Pics 5", ROMX[$4000], BANK[PICS_5] +SECTION "Pics 5", ROMX, BANK[PICS_5] BulbasaurPicFront:: INCBIN "pic/bmon/bulbasaur.pic" BulbasaurPicBack:: INCBIN "pic/monback/bulbasaurb.pic" @@ -876,7 +876,7 @@ VictreebelPicFront:: INCBIN "pic/bmon/victreebel.pic" VictreebelPicBack:: INCBIN "pic/monback/victreebelb.pic" -SECTION "Battle (bank D)", ROMX[$7244], BANK[$D] +SECTION "Battle (bank D)", ROMX, BANK[$D] INCLUDE "engine/titlescreen2.asm" INCLUDE "engine/battle/link_battle_versus_text.asm" @@ -886,7 +886,7 @@ INCLUDE "engine/multiply_divide.asm" INCLUDE "engine/game_corner_slots.asm" -SECTION "bankE",ROMX[$4000],BANK[$E] +SECTION "bankE",ROMX,BANK[$E] INCLUDE "data/moves.asm" BaseStats: INCLUDE "data/base_stats.asm" @@ -912,12 +912,12 @@ INCLUDE "engine/battle/moveEffects/transform_effect.asm" INCLUDE "engine/battle/moveEffects/reflect_light_screen_effect.asm" -SECTION "bankF",ROMX[$4000],BANK[$F] +SECTION "bankF",ROMX,BANK[$F] INCLUDE "engine/battle/core.asm" -SECTION "bank10",ROMX[$4000],BANK[$10] +SECTION "bank10",ROMX,BANK[$10] INCLUDE "engine/menu/pokedex.asm" INCLUDE "engine/trade.asm" @@ -925,7 +925,7 @@ INCLUDE "engine/intro.asm" INCLUDE "engine/trade2.asm" -SECTION "bank11",ROMX[$4000],BANK[$11] +SECTION "bank11",ROMX,BANK[$11] INCLUDE "data/mapHeaders/lavendertown.asm" INCLUDE "data/mapObjects/lavendertown.asm" @@ -1070,7 +1070,7 @@ SeafoamIslands5Blocks: INCBIN "maps/seafoamislands5.blk" INCLUDE "engine/overworld/hidden_objects.asm" -SECTION "bank12",ROMX[$4000],BANK[$12] +SECTION "bank12",ROMX,BANK[$12] INCLUDE "data/mapHeaders/route7.asm" INCLUDE "data/mapObjects/route7.asm" @@ -1249,7 +1249,7 @@ INCLUDE "data/mapObjects/safarizonesecrethouse.asm" SafariZoneSecretHouseBlocks: INCBIN "maps/safarizonesecrethouse.blk" -SECTION "bank13",ROMX[$4000],BANK[$13] +SECTION "bank13",ROMX,BANK[$13] TrainerPics:: YoungsterPic:: INCBIN "pic/trainer/youngster.pic" @@ -1314,7 +1314,7 @@ INCLUDE "engine/give_pokemon.asm" INCLUDE "engine/predefs.asm" -SECTION "bank14",ROMX[$4000],BANK[$14] +SECTION "bank14",ROMX,BANK[$14] INCLUDE "data/mapHeaders/route22.asm" INCLUDE "data/mapObjects/route22.asm" @@ -1392,7 +1392,7 @@ INCLUDE "engine/menu/prize_menu.asm" INCLUDE "engine/hidden_object_functions14.asm" -SECTION "bank15",ROMX[$4000],BANK[$15] +SECTION "bank15",ROMX,BANK[$15] INCLUDE "data/mapHeaders/route2.asm" INCLUDE "data/mapObjects/route2.asm" @@ -1484,7 +1484,7 @@ INCLUDE "engine/menu/diploma.asm" INCLUDE "engine/overworld/trainers.asm" -SECTION "bank16",ROMX[$4000],BANK[$16] +SECTION "bank16",ROMX,BANK[$16] INCLUDE "data/mapHeaders/route6.asm" INCLUDE "data/mapObjects/route6.asm" @@ -1574,7 +1574,7 @@ HallofFameRoomBlocks: INCLUDE "engine/overworld/saffron_guards.asm" -SECTION "bank17",ROMX[$4000],BANK[$17] +SECTION "bank17",ROMX,BANK[$17] SaffronMartBlocks: LavenderMartBlocks: @@ -1730,7 +1730,7 @@ INCLUDE "engine/predefs17_2.asm" INCLUDE "engine/hidden_object_functions17.asm" -SECTION "bank18",ROMX[$4000],BANK[$18] +SECTION "bank18",ROMX,BANK[$18] ViridianForestBlocks: INCBIN "maps/viridianforest.blk" UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk" @@ -1853,7 +1853,7 @@ SilphCo11Blocks: INCBIN "maps/silphco11.blk" INCLUDE "engine/hidden_object_functions18.asm" -SECTION "bank19",ROMX[$4000],BANK[$19] +SECTION "bank19",ROMX,BANK[$19] Overworld_GFX: INCBIN "gfx/tilesets/overworld.t2.2bpp" Overworld_Block: INCBIN "gfx/blocksets/overworld.bst" @@ -1875,7 +1875,7 @@ Plateau_GFX: INCBIN "gfx/tilesets/plateau.t10.2bpp" Plateau_Block: INCBIN "gfx/blocksets/plateau.bst" -SECTION "bank1A",ROMX[$4000],BANK[$1A] +SECTION "bank1A",ROMX,BANK[$1A] INCLUDE "engine/battle/decrement_pp.asm" @@ -1911,7 +1911,7 @@ Facility_GFX: INCBIN "gfx/tilesets/facility.2bpp" Facility_Block: INCBIN "gfx/blocksets/facility.bst" -SECTION "bank1B",ROMX[$4000],BANK[$1B] +SECTION "bank1B",ROMX,BANK[$1B] Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.t4.2bpp" Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst" @@ -1929,7 +1929,7 @@ Underground_GFX: INCBIN "gfx/tilesets/underground.t7.2bpp" Underground_Block: INCBIN "gfx/blocksets/underground.bst" -SECTION "bank1C",ROMX[$4000],BANK[$1C] +SECTION "bank1C",ROMX,BANK[$1C] INCLUDE "engine/gamefreak.asm" INCLUDE "engine/hall_of_fame.asm" @@ -1944,7 +1944,7 @@ INCLUDE "engine/palettes.asm" INCLUDE "engine/save.asm" -SECTION "bank1D",ROMX[$4000],BANK[$1D] +SECTION "bank1D",ROMX,BANK[$1D] CopycatsHouse1FBlocks: INCBIN "maps/copycatshouse1f.blk" @@ -2076,7 +2076,7 @@ INCLUDE "engine/menu/league_pc.asm" INCLUDE "engine/overworld/hidden_items.asm" -SECTION "bank1E",ROMX[$4000],BANK[$1E] +SECTION "bank1E",ROMX,BANK[$1E] INCLUDE "engine/battle/animations.asm" @@ -1,4 +1,4 @@ -SECTION "Sprite Buffers", SRAM[$a000], BANK[0] +SECTION "Sprite Buffers", SRAM, BANK[0] sSpriteBuffer0:: ds SPRITEBUFFERSIZE ; a000 sSpriteBuffer1:: ds SPRITEBUFFERSIZE ; a188 @@ -9,7 +9,7 @@ sSpriteBuffer2:: ds SPRITEBUFFERSIZE ; a310 sHallOfFame:: ds HOF_TEAM * HOF_TEAM_CAPACITY ; a598 -SECTION "Save Data", SRAM[$a000], BANK[1] +SECTION "Save Data", SRAM, BANK[1] ds $598 sPlayerName:: ds NAME_LENGTH ; a598 @@ -21,7 +21,7 @@ sTilesetType:: ds 1 ; b522 sMainDataCheckSum:: ds 1 ; b523 -SECTION "Saved Boxes 1", SRAM[$a000], BANK[2] +SECTION "Saved Boxes 1", SRAM, BANK[2] sBox1:: ds wBoxDataEnd - wBoxDataStart ; a000 sBox2:: ds wBoxDataEnd - wBoxDataStart ; a462 @@ -33,7 +33,7 @@ sBank2AllBoxesChecksum:: ds 1 ; ba4c sBank2IndividualBoxChecksums:: ds 6 ; ba4d -SECTION "Saved Boxes 2", SRAM[$a000], BANK[3] +SECTION "Saved Boxes 2", SRAM, BANK[3] sBox7:: ds wBoxDataEnd - wBoxDataStart ; a000 sBox8:: ds wBoxDataEnd - wBoxDataStart ; a462 @@ -19,7 +19,7 @@ INCLUDE "macros.asm" INCLUDE "hram.asm" -SECTION "Text 1", ROMX[$4000], BANK[TEXT_1] +SECTION "Text 1", ROMX, BANK[TEXT_1] _CardKeySuccessText1:: text "Bingo! @@" @@ -205,7 +205,7 @@ INCLUDE "text/maps/silph_co_4f.asm" INCLUDE "text/maps/silph_co_5f_1.asm" -SECTION "Text 2", ROMX[$4000], BANK[TEXT_2] +SECTION "Text 2", ROMX, BANK[TEXT_2] INCLUDE "text/maps/silph_co_5f_2.asm" INCLUDE "text/maps/silph_co_6f.asm" @@ -237,7 +237,7 @@ INCLUDE "text/maps/agatha.asm" INCLUDE "text/maps/rock_tunnel_b2f_1.asm" -SECTION "Text 3", ROMX[$4000], BANK[TEXT_3] +SECTION "Text 3", ROMX, BANK[TEXT_3] INCLUDE "text/maps/rock_tunnel_b2f_2.asm" INCLUDE "text/maps/seafoam_islands_b4f.asm" @@ -340,7 +340,7 @@ _BetHowManySlotMachineText:: done _StartSlotMachineText:: - text "Auf geh",$B3,"'s! " ; "{t}{'s}" instead of "{t'}{s}" + text "Auf geht","'s! " ; "{t}{'s}" instead of "{t'}{s}" done _NotEnoughCoinsSlotMachineText:: @@ -1931,7 +1931,6 @@ _NoMonText:: line "keine #MON!" prompt - _CantTakeMonText:: text "Du kannst keine" line "#MON mehr" @@ -1942,14 +1941,12 @@ _CantTakeMonText:: cont "lagern." prompt - _ReleaseWhichMonText:: text "Welches #MON" line "soll freigelassen" cont "werden?" done - _OnceReleasedText:: text "Ist es erstmal" line "freigelassen," @@ -2097,7 +2094,7 @@ INCLUDE "text/maps/saffron_gates.asm" INCLUDE "text/maps/daycare_1.asm" -SECTION "Text 4", ROMX[$4000], BANK[TEXT_4] +SECTION "Text 4", ROMX, BANK[TEXT_4] INCLUDE "text/maps/daycare_2.asm" INCLUDE "text/maps/underground_path_route_6_entrance.asm" @@ -2136,7 +2133,7 @@ INCLUDE "text/maps/route_10.asm" INCLUDE "text/maps/route_11_1.asm" -SECTION "Text 5", ROMX[$4000], BANK[TEXT_5] +SECTION "Text 5", ROMX, BANK[TEXT_5] INCLUDE "text/maps/route_11_2.asm" INCLUDE "text/maps/route_12.asm" @@ -2154,7 +2151,7 @@ INCLUDE "text/maps/route_23.asm" INCLUDE "text/maps/route_24_1.asm" -SECTION "Text 6", ROMX[$4000], BANK[TEXT_6] +SECTION "Text 6", ROMX, BANK[TEXT_6] INCLUDE "text/maps/route_24_2.asm" INCLUDE "text/maps/route_25.asm" @@ -2503,7 +2500,7 @@ INCLUDE "text/maps/museum_2f.asm" INCLUDE "text/maps/pewter_gym_1.asm" -SECTION "Text 7", ROMX[$4000], BANK[TEXT_7] +SECTION "Text 7", ROMX, BANK[TEXT_7] INCLUDE "text/maps/pewter_gym_2.asm" INCLUDE "text/maps/pewter_house_1.asm" @@ -2535,7 +2532,7 @@ INCLUDE "text/maps/vermilion_mart.asm" INCLUDE "text/maps/vermilion_gym_1.asm" -SECTION "Text 8", ROMX[$4000], BANK[TEXT_8] +SECTION "Text 8", ROMX, BANK[TEXT_8] INCLUDE "text/maps/vermilion_gym_2.asm" INCLUDE "text/maps/vermilion_house.asm" @@ -2567,7 +2564,7 @@ INCLUDE "text/maps/safari_zone_entrance.asm" INCLUDE "text/maps/fuchsia_gym_1.asm" -SECTION "Text 9", ROMX[$4000], BANK[TEXT_9] +SECTION "Text 9", ROMX, BANK[TEXT_9] INCLUDE "text/maps/fuchsia_gym_2.asm" INCLUDE "text/maps/fuchsia_meeting_room.asm" @@ -2827,7 +2824,7 @@ _CableClubNPCLinkClosedBecauseOfInactivityText:: done -SECTION "Text 10", ROMX[$4000], BANK[TEXT_10] +SECTION "Text 10", ROMX, BANK[TEXT_10] _CableClubNPCPleaseComeAgainText:: text "Komm jederzeit" @@ -3212,7 +3209,7 @@ _BoxFullCannotThrowBallText:: prompt -SECTION "Text 11", ROMX[$4000], BANK[TEXT_11] +SECTION "Text 11", ROMX, BANK[TEXT_11] _ItemUseText001:: text "<PLAYER> setzt@@" @@ -3427,11 +3424,11 @@ _UsedCutText:: prompt -SECTION "Pokedex Text", ROMX[$4000], BANK[POKEDEX_TEXT] +SECTION "Pokedex Text", ROMX, BANK[POKEDEX_TEXT] INCLUDE "text/pokedex.asm" -SECTION "Move Names", ROMX[$4000], BANK[MOVE_NAMES] +SECTION "Move Names", ROMX, BANK[MOVE_NAMES] INCLUDE "text/move_names.asm" diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/celadon_dept_store_roof.asm index 2920178a..3d13de49 100644 --- a/text/maps/celadon_dept_store_roof.asm +++ b/text/maps/celadon_dept_store_roof.asm @@ -118,7 +118,6 @@ _CeladonMartRoofText4:: cont "Getränk?" done - _CeladonMartRoofText6:: text "DACHGARTEN:" line "AUTOMATEN" @@ -60,7 +60,7 @@ battle_struct: MACRO ENDM -SECTION "WRAM Bank 0", WRAM0 [$c000] +SECTION "WRAM Bank 0", WRAM0 wUnusedC000:: ; c000 ds 1 @@ -1610,7 +1610,7 @@ wEnemyMonMaxHP:: dw wEnemyMonAttack:: dw wEnemyMonDefense:: dw wEnemyMonSpeed:: ds 1 -SECTION "WRAM Bank 1", WRAMX[$d000], BANK[1] +SECTION "WRAM Bank 1", WRAMX, BANK[1] ds 1 wEnemyMonSpecial:: dw wEnemyMonPP:: ds 2 ; NUM_MOVES - 2 @@ -1738,7 +1738,7 @@ wPlayerBattleStatus3:: ; d064 ; bit 0 - toxic ; bit 1 - light screen ; bit 2 - reflect -; bit 3 - tranformed +; bit 3 - transformed ds 1 wEnemyStatsToDouble:: ; d065 @@ -2049,7 +2049,7 @@ wPredefBank:: ; d0b7 wMonHeader:: ; d0b8 wMonHIndex:: ; d0b8 -; In the ROM base stats data stucture, this is the dex number, but it is +; In the ROM base stats data structure, this is the dex number, but it is ; overwritten with the internal index number after the header is copied to WRAM. ds 1 @@ -3060,7 +3060,7 @@ wd732:: ; d732 ; bit 1: remnant of debug mode? not set by the game code. ; if it is set ; 1. skips most of Prof. Oak's speech, and uses NINTEN as the player's name and SONY as the rival's name -; 2. does not have the player start in floor two of the playyer's house (instead sending them to [wLastMap]) +; 2. does not have the player start in floor two of the player's house (instead sending them to [wLastMap]) ; 3. allows wild battles to be avoided by holding down B ; bit 2: the target warp is a fly warp (bit 3 set or blacked out) or a dungeon warp (bit 4 set) ; bit 3: used warp pad, escape rope, dig, teleport, or fly, so the target warp is a "fly warp" @@ -3088,7 +3088,7 @@ wd736:: ; d736 ; bit 1: the player is currently stepping down from a door ; bit 2: standing on a warp ; bit 6: jumping down a ledge / fishing animation -; bit 7: player sprite spinning due to spin tiles (Rocket hidehout / Viridian Gym) +; bit 7: player sprite spinning due to spin tiles (Rocket hideout / Viridian Gym) ds 1 wCompletedInGameTradeFlags:: ; d737 @@ -3173,7 +3173,7 @@ wUnusedDA38:: ; da38 wCurMapScript:: ; da39 ; index of current map script, mostly used as index for function pointer array -; mostly copied from map-specific map script pointer and wirtten back later +; mostly copied from map-specific map script pointer and written back later ds 1 ds 7 @@ -3225,9 +3225,9 @@ wBoxMonNicksEnd:: ; dee2 wBoxDataEnd:: -SECTION "Stack", WRAMX[$dfff], BANK[1] +SECTION "Stack", WRAMX[$df00], BANK[1] + ds $ff wStack:: ; dfff - ds -$100 INCLUDE "sram.asm" |