diff options
| author | dannye <33dannye@gmail.com> | 2022-09-11 23:34:59 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2022-09-12 00:53:37 -0500 |
| commit | ecab35295aefb44227ba38f257dc40c8c10474e3 (patch) | |
| tree | d04160bc19180ee50a941d121f90cc7071e7a672 /scripts | |
| parent | Replace Hard-Coded Number With Constant (diff) | |
| parent | Add `UNUSED_TYPE`/`UNUSED_TYPE_END` constants (diff) | |
| download | pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.gz pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.xz pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/CinnabarLabFossilRoom.asm | 2 | ||||
| -rw-r--r-- | scripts/CinnabarLabTradeRoom.asm | 4 | ||||
| -rw-r--r-- | scripts/PewterPokecenter2.asm | 2 | ||||
| -rw-r--r-- | scripts/Route11Gate2F.asm | 2 | ||||
| -rw-r--r-- | scripts/Route18Gate2F.asm | 2 | ||||
| -rw-r--r-- | scripts/Route2TradeHouse.asm | 2 | ||||
| -rw-r--r-- | scripts/UndergroundPathRoute5.asm | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/scripts/CinnabarLabFossilRoom.asm b/scripts/CinnabarLabFossilRoom.asm index 2c388119..7ed9b1a9 100644 --- a/scripts/CinnabarLabFossilRoom.asm +++ b/scripts/CinnabarLabFossilRoom.asm @@ -100,7 +100,7 @@ Lab4Text_75dd5: Lab4Text2: text_asm - ld a, TRADE_FOR_SAILOR + ld a, TRADE_FOR_STICKY ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/CinnabarLabTradeRoom.asm b/scripts/CinnabarLabTradeRoom.asm index 1f8710be..64f1975d 100644 --- a/scripts/CinnabarLabTradeRoom.asm +++ b/scripts/CinnabarLabTradeRoom.asm @@ -12,13 +12,13 @@ Lab2Text1: Lab2Text2: text_asm - ld a, TRADE_FOR_DORIS + ld a, TRADE_FOR_BUFFY ld [wWhichTrade], a jr Lab2DoTrade Lab2Text3: text_asm - ld a, TRADE_FOR_CRINKLES + ld a, TRADE_FOR_CEZANNE ld [wWhichTrade], a Lab2DoTrade: predef DoInGameTradeDialogue diff --git a/scripts/PewterPokecenter2.asm b/scripts/PewterPokecenter2.asm index 79d22b2f..dd80e901 100644 --- a/scripts/PewterPokecenter2.asm +++ b/scripts/PewterPokecenter2.asm @@ -52,7 +52,7 @@ PewterJigglypuff:: call DelayFrames ld a, [wChannelSoundIDs] ld b, a - ld a, [wChannelSoundIDs + Ch2] + ld a, [wChannelSoundIDs + CHAN2] or b jr nz, .spinMovementLoop diff --git a/scripts/Route11Gate2F.asm b/scripts/Route11Gate2F.asm index 65352cd9..4026dbc9 100644 --- a/scripts/Route11Gate2F.asm +++ b/scripts/Route11Gate2F.asm @@ -9,7 +9,7 @@ Route11Gate2F_TextPointers: Route11GateUpstairsText1: text_asm - ld a, TRADE_FOR_TERRY + ld a, TRADE_FOR_GURIO ld [wWhichTrade], a predef DoInGameTradeDialogue Route11GateUpstairsScriptEnd: diff --git a/scripts/Route18Gate2F.asm b/scripts/Route18Gate2F.asm index efb6d70a..67ec2641 100644 --- a/scripts/Route18Gate2F.asm +++ b/scripts/Route18Gate2F.asm @@ -8,7 +8,7 @@ Route18Gate2F_TextPointers: Route18GateUpstairsText1: text_asm - ld a, TRADE_FOR_MARC + ld a, TRADE_FOR_SPIKE ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/Route2TradeHouse.asm b/scripts/Route2TradeHouse.asm index 85ed2d34..8f2661f1 100644 --- a/scripts/Route2TradeHouse.asm +++ b/scripts/Route2TradeHouse.asm @@ -11,7 +11,7 @@ Route2HouseText1: Route2HouseText2: text_asm - ld a, TRADE_FOR_MARCEL + ld a, TRADE_FOR_MILES ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/UndergroundPathRoute5.asm b/scripts/UndergroundPathRoute5.asm index 5c078050..47c75fef 100644 --- a/scripts/UndergroundPathRoute5.asm +++ b/scripts/UndergroundPathRoute5.asm @@ -11,7 +11,7 @@ UndergroundPathRoute5_TextPointers: UndergroundPathEntranceRoute5Text1: text_asm - ld a, TRADE_FOR_SPOT + ld a, TRADE_FOR_RICKY ld [wWhichTrade], a predef DoInGameTradeDialogue ld hl, UndergroundPathEntranceRoute5_TextScriptEndingText |