Skip to content

Commit 77da69f

Browse files
vulcandthvulcandth
committed
Hotfix Overworld Hatch map glitches
1 parent 0a4a362 commit 77da69f

File tree

4 files changed

+41
-40
lines changed

4 files changed

+41
-40
lines changed

‎.github/workflows/build.yml

+24-24
Original file line numberDiff line numberDiff line change
@@ -55,70 +55,70 @@ jobs:
5555
run: |
5656
make -j$(nproc)
5757
mkdir build
58-
mv polishedcrystal-3.1.0.gbc build/polishedcrystal-3.1.0-${{ env.SHORT_SHA }}.gbc
59-
mv polishedcrystal-3.1.0.sym build/polishedcrystal-3.1.0-${{ env.SHORT_SHA }}.sym
58+
mv polishedcrystal-3.1.1.gbc build/polishedcrystal-3.1.1-${{ env.SHORT_SHA }}.gbc
59+
mv polishedcrystal-3.1.1.sym build/polishedcrystal-3.1.1-${{ env.SHORT_SHA }}.sym
6060
make tidy
6161
6262
- id: build-polishedcrystal-faithful
6363
name: "Build polishedcrystal-faithful"
6464
run: |
6565
make -j$(nproc) faithful
66-
mv polishedcrystal-faithful-3.1.0.gbc build/polishedcrystal-faithful-3.1.0-${{ env.SHORT_SHA }}.gbc
67-
mv polishedcrystal-faithful-3.1.0.sym build/polishedcrystal-faithful-3.1.0-${{ env.SHORT_SHA }}.sym
66+
mv polishedcrystal-faithful-3.1.1.gbc build/polishedcrystal-faithful-3.1.1-${{ env.SHORT_SHA }}.gbc
67+
mv polishedcrystal-faithful-3.1.1.sym build/polishedcrystal-faithful-3.1.1-${{ env.SHORT_SHA }}.sym
6868
make tidy
6969
7070
# BUILD VC PATCHES
7171
- id: build-polishedcrystal-vc
7272
name: "Build polishedcrystal vc"
7373
run: |
7474
make -j$(nproc) vc
75-
mv polishedcrystal-3.1.0_vc.gbc build/polishedcrystal-3.1.0-${{ env.SHORT_SHA }}_vc.gbc
76-
mv polishedcrystal-3.1.0.patch build/polishedcrystal-3.1.0-${{ env.SHORT_SHA }}.patch
77-
mv polishedcrystal-3.1.0_vc.sym build/polishedcrystal-3.1.0-${{ env.SHORT_SHA }}_vc.sym
75+
mv polishedcrystal-3.1.1_vc.gbc build/polishedcrystal-3.1.1-${{ env.SHORT_SHA }}_vc.gbc
76+
mv polishedcrystal-3.1.1.patch build/polishedcrystal-3.1.1-${{ env.SHORT_SHA }}.patch
77+
mv polishedcrystal-3.1.1_vc.sym build/polishedcrystal-3.1.1-${{ env.SHORT_SHA }}_vc.sym
7878
make tidy
7979
8080
- id: build-polishedcrystal-faithful-vc
8181
name: "Build polishedcrystal-faithful vc"
8282
run: |
8383
make -j$(nproc) faithful vc
84-
mv polishedcrystal-faithful-3.1.0.gbc build/polishedcrystal-faithful-3.1.0-${{ env.SHORT_SHA }}_vc.gbc
85-
mv polishedcrystal-faithful-3.1.0.patch build/polishedcrystal-faithful-3.1.0-${{ env.SHORT_SHA }}.patch
86-
mv polishedcrystal-faithful-3.1.0.sym build/polishedcrystal-faithful-3.1.0-${{ env.SHORT_SHA }}_vc.sym
84+
mv polishedcrystal-faithful-3.1.1.gbc build/polishedcrystal-faithful-3.1.1-${{ env.SHORT_SHA }}_vc.gbc
85+
mv polishedcrystal-faithful-3.1.1.patch build/polishedcrystal-faithful-3.1.1-${{ env.SHORT_SHA }}.patch
86+
mv polishedcrystal-faithful-3.1.1.sym build/polishedcrystal-faithful-3.1.1-${{ env.SHORT_SHA }}_vc.sym
8787
make tidy
8888
8989
# BUILD DEBUG ROMS
9090
- id: build-polisheddebug
9191
name: "Build polisheddebug"
9292
run: |
9393
make -j$(nproc) debug vc
94-
mv polishedcrystal-debug-3.1.0.gbc build/polishedcrystal-debug-3.1.0-${{ env.SHORT_SHA }}.gbc
95-
mv polishedcrystal-debug-3.1.0.sym build/polishedcrystal-debug-3.1.0-${{ env.SHORT_SHA }}.sym
94+
mv polishedcrystal-debug-3.1.1.gbc build/polishedcrystal-debug-3.1.1-${{ env.SHORT_SHA }}.gbc
95+
mv polishedcrystal-debug-3.1.1.sym build/polishedcrystal-debug-3.1.1-${{ env.SHORT_SHA }}.sym
9696
make tidy
9797
9898
- id: build-polisheddebug-faithful
9999
name: "Build polisheddebug-faithful"
100100
run: |
101101
make -j$(nproc) faithful debug vc
102-
mv polishedcrystal-faithful-debug-3.1.0.gbc build/polishedcrystal-faithful-debug-3.1.0-${{ env.SHORT_SHA }}.gbc
103-
mv polishedcrystal-faithful-debug-3.1.0.sym build/polishedcrystal-faithful-debug-3.1.0-${{ env.SHORT_SHA }}.sym
102+
mv polishedcrystal-faithful-debug-3.1.1.gbc build/polishedcrystal-faithful-debug-3.1.1-${{ env.SHORT_SHA }}.gbc
103+
mv polishedcrystal-faithful-debug-3.1.1.sym build/polishedcrystal-faithful-debug-3.1.1-${{ env.SHORT_SHA }}.sym
104104
make tidy
105105
106106
- id: build-polisheddebug-vc
107107
name: "Build polisheddebug vc"
108108
run: |
109109
make -j$(nproc) debug vc
110-
mv polishedcrystal-debug-3.1.0_vc.gbc build/polishedcrystal-debug-3.1.0-${{ env.SHORT_SHA }}_vc.gbc
111-
mv polishedcrystal-debug-3.1.0.patch build/polishedcrystal-debug-3.1.0-${{ env.SHORT_SHA }}.patch
112-
mv polishedcrystal-debug-3.1.0.sym build/polishedcrystal-debug-3.1.0-${{ env.SHORT_SHA }}_vc.sym
110+
mv polishedcrystal-debug-3.1.1_vc.gbc build/polishedcrystal-debug-3.1.1-${{ env.SHORT_SHA }}_vc.gbc
111+
mv polishedcrystal-debug-3.1.1.patch build/polishedcrystal-debug-3.1.1-${{ env.SHORT_SHA }}.patch
112+
mv polishedcrystal-debug-3.1.1.sym build/polishedcrystal-debug-3.1.1-${{ env.SHORT_SHA }}_vc.sym
113113
make tidy
114114
115115
- id: build-polisheddebug-faithful-vc
116116
name: "Build polisheddebug-faithful vc"
117117
run: |
118118
make -j$(nproc) faithful debug vc
119-
mv polishedcrystal-faithful-debug-3.1.0_vc.gbc build/polishedcrystal-faithful-debug-3.1.0-${{ env.SHORT_SHA }}_vc.gbc
120-
mv polishedcrystal-faithful-debug-3.1.0.patch build/polishedcrystal-faithful-debug-3.1.0-${{ env.SHORT_SHA }}.patch
121-
mv polishedcrystal-faithful-debug-3.1.0_vc.sym build/polishedcrystal-faithful-debug-3.1.0-${{ env.SHORT_SHA }}_vc.sym
119+
mv polishedcrystal-faithful-debug-3.1.1_vc.gbc build/polishedcrystal-faithful-debug-3.1.1-${{ env.SHORT_SHA }}_vc.gbc
120+
mv polishedcrystal-faithful-debug-3.1.1.patch build/polishedcrystal-faithful-debug-3.1.1-${{ env.SHORT_SHA }}.patch
121+
mv polishedcrystal-faithful-debug-3.1.1_vc.sym build/polishedcrystal-faithful-debug-3.1.1-${{ env.SHORT_SHA }}_vc.sym
122122
make tidy
123123
124124
# UPLOAD ARTIFACTS – only if the repo is owned by Rangi42 (i.e., not a fork)
@@ -130,7 +130,7 @@ jobs:
130130
name: "polishedcrystal"
131131
retention-days: 1
132132
path: |
133-
build/polishedcrystal-3.1.0-${{ env.SHORT_SHA }}.*
133+
build/polishedcrystal-3.1.1-${{ env.SHORT_SHA }}.*
134134
135135
- id: upload-polishedcrystal-faithful
136136
if: ${{ github.repository_owner == 'Rangi42' }}
@@ -140,7 +140,7 @@ jobs:
140140
name: "polishedcrystal-faithful"
141141
retention-days: 1
142142
path: |
143-
build/polishedcrystal-faithful-3.1.0-${{ env.SHORT_SHA }}.*
143+
build/polishedcrystal-faithful-3.1.1-${{ env.SHORT_SHA }}.*
144144
145145
- id: upload-polisheddebug
146146
if: ${{ github.repository_owner == 'Rangi42' }}
@@ -150,7 +150,7 @@ jobs:
150150
name: "polisheddebug"
151151
retention-days: 1
152152
path: |
153-
build/polishedcrystal-debug-3.1.0-${{ env.SHORT_SHA }}.*
153+
build/polishedcrystal-debug-3.1.1-${{ env.SHORT_SHA }}.*
154154
155155
- id: upload-polisheddebug-faithful
156156
if: ${{ github.repository_owner == 'Rangi42' }}
@@ -160,4 +160,4 @@ jobs:
160160
name: "polisheddebug-faithful"
161161
retention-days: 1
162162
path: |
163-
build/polishedcrystal-faithful-debug-3.1.0-${{ env.SHORT_SHA }}.*
163+
build/polishedcrystal-faithful-debug-3.1.1-${{ env.SHORT_SHA }}.*

‎.github/workflows/nightly.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ on:
1111
# - cron: '0 5 * * *'
1212

1313
env:
14-
NIGHTLY_TAG: "v3.1.0"
15-
NIGHTLY_NAME: "3.1.0"
14+
NIGHTLY_TAG: "v3.1.1"
15+
NIGHTLY_NAME: "3.1.1"
1616
NIGHTLY_BODY: |
17-
This is the current Polished Crystal 3.1.0 *beta* release. The assets all have an 8-character "commit hash" at the end to identify the exact code they're built from.
17+
This is the current Polished Crystal 3.1.1 *beta* release. The assets all have an 8-character "commit hash" at the end to identify the exact code they're built from.
1818
1919
The **.gbc** assets are ROMs. If you just want to play the game, download one (regular, `-faithful` which omits some non-canon changes, or `noir` which is in grayscale) and load it in [BGB](https://bgb.bircd.org/), [mGBA](https://mgba.io/), [Gambatte](https://github.com/sinamas/gambatte), or another accurate Game Boy Color emulator. (***Do not use VBA*** or VBA-M.)
2020
@@ -114,9 +114,9 @@ jobs:
114114
with:
115115
tag_name: ${{ env.NIGHTLY_TAG }}
116116
files: |
117-
./build/polishedcrystal-3.1.0-${{ env.SHORT_SHA }}.gbc
118-
./build/polishedcrystal-3.1.0-${{ env.SHORT_SHA }}.patch
119-
./build/polishedcrystal-3.1.0-${{ env.SHORT_SHA }}.sym
117+
./build/polishedcrystal-3.1.1-${{ env.SHORT_SHA }}.gbc
118+
./build/polishedcrystal-3.1.1-${{ env.SHORT_SHA }}.patch
119+
./build/polishedcrystal-3.1.1-${{ env.SHORT_SHA }}.sym
120120
121121
# UPLOAD FAITHFUL ASSETS
122122
- name: Upload faithful assets
@@ -125,9 +125,9 @@ jobs:
125125
with:
126126
tag_name: ${{ env.NIGHTLY_TAG }}
127127
files: |
128-
./build/polishedcrystal-faithful-3.1.0-${{ env.SHORT_SHA }}.gbc
129-
./build/polishedcrystal-faithful-3.1.0-${{ env.SHORT_SHA }}.patch
130-
./build/polishedcrystal-faithful-3.1.0-${{ env.SHORT_SHA }}.sym
128+
./build/polishedcrystal-faithful-3.1.1-${{ env.SHORT_SHA }}.gbc
129+
./build/polishedcrystal-faithful-3.1.1-${{ env.SHORT_SHA }}.patch
130+
./build/polishedcrystal-faithful-3.1.1-${{ env.SHORT_SHA }}.sym
131131
132132
# UPLOAD DEBUG ASSETS
133133
- name: Upload debug assets
@@ -136,9 +136,9 @@ jobs:
136136
with:
137137
tag_name: ${{ env.NIGHTLY_TAG }}
138138
files: |
139-
./build/polishedcrystal-debug-3.1.0-${{ env.SHORT_SHA }}.gbc
140-
./build/polishedcrystal-debug-3.1.0-${{ env.SHORT_SHA }}.patch
141-
./build/polishedcrystal-debug-3.1.0-${{ env.SHORT_SHA }}.sym
139+
./build/polishedcrystal-debug-3.1.1-${{ env.SHORT_SHA }}.gbc
140+
./build/polishedcrystal-debug-3.1.1-${{ env.SHORT_SHA }}.patch
141+
./build/polishedcrystal-debug-3.1.1-${{ env.SHORT_SHA }}.sym
142142
143143
# UPLOAD FAITHFUL DEBUG ASSETS
144144
- name: Upload faithful debug assets
@@ -147,6 +147,6 @@ jobs:
147147
with:
148148
tag_name: ${{ env.NIGHTLY_TAG }}
149149
files: |
150-
./build/polishedcrystal-faithful-debug-3.1.0-${{ env.SHORT_SHA }}.gbc
151-
./build/polishedcrystal-faithful-debug-3.1.0-${{ env.SHORT_SHA }}.patch
152-
./build/polishedcrystal-faithful-debug-3.1.0-${{ env.SHORT_SHA }}.sym
150+
./build/polishedcrystal-faithful-debug-3.1.1-${{ env.SHORT_SHA }}.gbc
151+
./build/polishedcrystal-faithful-debug-3.1.1-${{ env.SHORT_SHA }}.patch
152+
./build/polishedcrystal-faithful-debug-3.1.1-${{ env.SHORT_SHA }}.sym

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
NAME := polishedcrystal
22
MODIFIERS :=
3-
VERSION := 3.1.0
3+
VERSION := 3.1.1
44

55
ROM_NAME = $(NAME)$(MODIFIERS)-$(VERSION)
66
EXTENSION := gbc

‎engine/pokemon/breeding.asm

+1
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ OverworldHatchEgg::
257257
call UpdateSprites
258258
farcall EnableDynPalUpdatesNoApply
259259
call FinishExitMenu
260+
farcall Script_refreshmap
260261
jmp RestartMapMusic
261262

262263
HatchEggs:

0 commit comments

Comments
 (0)