Squashed commit of the following:

commit fe8d3c5 Author: vulcandth <[email protected]> Date: Sat Mar 26 15:59:36 2022 -0500 Build the Virtual Console patches with `make red_vc` and `make blue_vc` (pret#351) commit 07df4a5 Author: Rangi <[email protected]> Date: Thu Mar 17 20:36:13 2022 -0400 Refactor pkmncompress.c to use common.h Fixes pret#349 commit 570d83b Author: Rangi <[email protected]> Date: Tue Mar 15 17:35:30 2022 -0400 Use noreturn for usage_exit commit e175577 Author: Rangi <[email protected]> Date: Tue Mar 15 17:29:07 2022 -0400 Use -flto for all tools commit a75dd22 Author: Rangi <[email protected]> Date: Tue Mar 8 21:52:57 2022 -0500 Slightly refactor some C tools commit 7e78c11 Author: Rangi <[email protected]> Date: Fri Mar 4 18:21:12 2022 -0500 Gen 1's Minimize graphic was not a complete 8x8 tile commit 9523681 Author: stringflow <[email protected]> Date: Thu Dec 9 17:30:15 2021 +0100 Fix incorrect comment about money received after battle (pret#346) * fix incorrect comment about money received after battle * fix incorrect comment in wram.asm commit 09e92c5 Author: Rangi <[email protected]> Date: Tue Nov 23 21:00:07 2021 -0500 Use ~X instead of $ff ^ X commit 865d37e Author: Rangi <[email protected]> Date: Tue Nov 23 20:56:57 2021 -0500 Use compound assignment operators commit 64e2b66 Author: Rangi <[email protected]> Date: Tue Nov 23 20:53:05 2021 -0500 Require rgbds 0.5.2 commit 157b593 Author: Rangi <[email protected]> Date: Sat Nov 6 13:24:19 2021 -0400 Use `dn` for wave instrument samples, like pokecrystal commit f68af5c Author: Yoann Fievez <[email protected]> Date: Sat Nov 6 00:45:09 2021 +0100 Add some constants for options (pret#344) Co-authored-by: Rangi <[email protected]> commit 8349bfd Author: Yoann Fievez <[email protected]> Date: Fri Nov 5 20:40:15 2021 +0100 Refactorize check button pressed (pret#340) commit b44a10a Author: Yoann Fievez <[email protected]> Date: Thu Nov 4 20:17:17 2021 +0100 Update 'make compare' for no pret repo and add 'make' for fork (pret#339) commit 2ee8ce2 Author: Rangi <[email protected]> Date: Wed Nov 3 17:07:08 2021 -0400 Comment on the CooltrainerFAI bug Fixes pret#308 commit e4845d3 Merge: 58d08bf 0af787e Author: Rangi <[email protected]> Date: Tue Nov 2 19:58:17 2021 -0400 Merge branch 'master' of https://github.com/pret/pokered commit 58d08bf Author: Rangi <[email protected]> Date: Tue Nov 2 19:57:08 2021 -0400 Identify some percentage constant values commit 0af787e Author: IIMarckus <[email protected]> Date: Fri Oct 8 04:30:39 2021 -0600 Kill Freenode. commit fc899e1 Author: Rangi <[email protected]> Date: Tue Oct 5 21:02:42 2021 -0400 `warp_event` warp IDs start at 1, like in pokegold/pokecrystal commit 5266001 Author: Rangi <[email protected]> Date: Tue Oct 5 20:46:46 2021 -0400 Clean up some redundant or unusual event comments commit d48a318 Author: Rangi <[email protected]> Date: Sun Sep 26 23:20:57 2021 -0400 Align `object_event` coordinates Fixes pret#336 commit 30acb46 Author: Amber Brault <[email protected]> Date: Sun Sep 26 22:57:55 2021 -0400 Fix typos (pret#334) commit 2c4f358 Author: Yoann Fievez <[email protected]> Date: Mon Sep 27 04:56:09 2021 +0200 Unify map event gen1 gen2 (pret#335) * Update sign to bg_event pret#289 * Rename warp to warp_event * Replace object to object_event * Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id commit f1285f8 Author: Rangi <[email protected]> Date: Wed Sep 8 20:59:22 2021 -0400 `ASSERT LOW(wSpriteStateData1) == 0 && LOW(wSpriteStateData2) == 0` commit 7ee8a65 Author: Rangi <[email protected]> Date: Sat Aug 28 17:02:20 2021 -0400 wcf4b -> wStringBuffer commit 2364261 Author: SatoMew <[email protected]> Date: Sun Aug 1 03:53:52 2021 +0100 Remove old tile animation comments (pret#333) They stopped being accurate after pret#304 and aren't really necessary.
SatoMew · Mar 26, 2022 · e922b6f · e922b6f
1 parent 3e1bcb9
commit e922b6f
Show file tree

Hide file tree

Showing 338 changed files with 5,171 additions and 3,617 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -15,3 +15,6 @@
 *.wav binary
 *.blk binary
 *.pic binary
+
+# Declare files that will always have CRLF line endings on checkout.
+*.patch.template text eol=crlf linguist-language=INI
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@master
         with:
           path: rgbds
-          ref: v0.5.1
+          ref: v0.5.2
           repository: gbdev/rgbds
 
       - name: Install rgbds
@@ -29,6 +29,7 @@ jobs:
           rm -rf rgbds
 
       - name: Compare
+        if: ${{ github.repository_owner == 'pret' }}
         run: |
           make DEBUG=1 -j$(nproc) compare
           if ! git diff-index --quiet HEAD --; then
@@ -37,6 +38,16 @@ jobs:
             return 1
           fi
 
+      - name: Make
+        if: ${{ github.repository_owner != 'pret' }}
+        run: |
+          make -j$(nproc)
+          if ! git diff-index --quiet HEAD --; then
+            echo 'Uncommitted changes detected:'
+            git diff-index HEAD --
+            return 1
+          fi
+
       - name: Discord webhook
         if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }}
         env:

diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 # compiled roms
 *.gbc
 *.gb
+*.patch
 
 # rgbds extras
 *.map

diff --git a/INSTALL.md b/INSTALL.md
@@ -42,9 +42,9 @@ Run setup and leave the default settings. At the "**Select Packages**" step, cho
 
 Double click on the text that says "**Skip**" next to each package to select the most recent version to install.
 
-Then follow the [**rgbds** install instructions](https://rgbds.gbdev.io/install/windows) for Windows with Cygwin to install **rgbds 0.5.1**.
+Then follow the [**rgbds** install instructions](https://rgbds.gbdev.io/install/windows) for Windows with Cygwin to install **rgbds 0.5.2**.
 
-**Note:** If you already have an older rgbds, you will need to update to 0.5.1. Ignore this if you have never installed rgbds before. If a version newer than 0.5.1 does not work, try downloading 0.5.1.
+**Note:** If you already have an older rgbds, you will need to update to 0.5.2. Ignore this if you have never installed rgbds before. If a version newer than 0.5.2 does not work, try downloading 0.5.2.
 
 Now open the **Cygwin terminal** and enter the following commands.
 
@@ -67,7 +67,7 @@ Install [**Homebrew**](https://brew.sh/). Follow the official instructions.
 
 Open **Terminal** and prepare to enter commands.
 
-Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/macos) for macOS to install **rgbds 0.5.1**.
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/macos) for macOS to install **rgbds 0.5.2**.
 
 Now you're ready to [build **pokered**](#build-pokered).
 
@@ -84,7 +84,7 @@ To install the software required for **pokered**:
 sudo apt-get install make gcc git
 ```
 
-Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.1** from source.
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.2** from source.
 
 ### OpenSUSE
 
@@ -94,7 +94,7 @@ To install the software required for **pokered**:
 sudo zypper install make gcc git
 ```
 
-Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.1** from source.
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.2** from source.
 
 ### Arch Linux
 
@@ -104,9 +104,9 @@ To install the software required for **pokered**:
 sudo pacman -S make gcc git
 ```
 
-Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/arch) for Arch Linux to install **rgbds 0.5.1**.
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/arch) for Arch Linux to install **rgbds 0.5.2**.
 
-If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.1** from source.
+If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.2** from source.
 
 ### Termux
 
@@ -122,7 +122,7 @@ To install **rgbds**:
 sudo apt install rgbds
 ```
 
-If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.1** from source.
+If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.2** from source.
 
 ### Other distros
 
@@ -133,7 +133,7 @@ If your distro is not listed here, try to find the required software in its repo
 - `git`
 - `rgbds`
 
-If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.1** from source.
+If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.2** from source.
 
 Now you're ready to [build **pokered**](#build-pokered).
 
@@ -155,8 +155,8 @@ make
 
 ### Build with a local rgbds version
 
-If you have different projects that require different versions of `rgbds`, it might not be convenient to install rgbds 0.5.1 globally. Instead, you can put its files in a directory within pokered, such as `pokered/rgbds-0.5.1/`. Then specify it when you run `make`:
+If you have different projects that require different versions of `rgbds`, it might not be convenient to install rgbds 0.5.2 globally. Instead, you can put its files in a directory within pokered, such as `pokered/rgbds-0.5.2/`. Then specify it when you run `make`:
 
 ```bash
-make RGBDS=rgbds-0.5.1/
+make RGBDS=rgbds-0.5.2/
 ```
diff --git a/Makefile b/Makefile
@@ -1,19 +1,27 @@
-roms := pokered.gbc pokeblue.gbc pokeblue_debug.gbc
+roms := \
+	pokered.gbc \
+	pokeblue.gbc \
+	pokeblue_debug.gbc
+patches := \
+	pokered.patch \
+	pokeblue.patch
 
 rom_obj := \
-audio.o \
-home.o \
-main.o \
-maps.o \
-text.o \
-wram.o \
-gfx/pics.o \
-gfx/sprites.o \
-gfx/tilesets.o
+	audio.o \
+	home.o \
+	main.o \
+	maps.o \
+	text.o \
+	wram.o \
+	gfx/pics.o \
+	gfx/sprites.o \
+	gfx/tilesets.o
 
 pokered_obj        := $(rom_obj:.o=_red.o)
 pokeblue_obj       := $(rom_obj:.o=_blue.o)
 pokeblue_debug_obj := $(rom_obj:.o=_blue_debug.o)
+pokered_vc_obj     := $(rom_obj:.o=_red_vc.o)
+pokeblue_vc_obj    := $(rom_obj:.o=_blue_vc.o)
 
 
 ### Build tools
@@ -43,22 +51,41 @@ all: $(roms)
 red:        pokered.gbc
 blue:       pokeblue.gbc
 blue_debug: pokeblue_debug.gbc
+red_vc:     pokered.patch
+blue_vc:    pokeblue.patch
 
 clean: tidy
-	find gfx \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -delete
+	find gfx \
+	     \( -iname '*.1bpp' \
+	        -o -iname '*.2bpp' \
+	        -o -iname '*.pic' \) \
+	     -delete
 
 tidy:
-	rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(pokeblue_debug_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o
+	$(RM) $(roms) \
+	      $(roms:.gbc=.sym) \
+	      $(roms:.gbc=.map) \
+	      $(patches) \
+	      $(patches:.patch=_vc.gbc) \
+	      $(patches:.patch=_vc.sym) \
+	      $(patches:.patch=_vc.map) \
+	      $(patches:%.patch=vc/%.constants.sym) \
+	      $(pokered_obj) \
+	      $(pokeblue_obj) \
+	      $(pokered_vc_obj) \
+	      $(pokeblue_vc_obj) \
+	      $(pokeblue_debug_obj) \
+	      rgbdscheck.o
 	$(MAKE) clean -C tools/
 
-compare: $(roms)
+compare: $(roms) $(patches)
 	@$(SHA1) -c roms.sha1
 
 tools:
 	$(MAKE) -C tools/
 
 
-RGBASMFLAGS = -h -L -Weverything
+RGBASMFLAGS = -h -L -Weverything -Wnumeric-string=2 -Wtruncation=1
 # Create a sym/map for debug purposes if `make` run with `DEBUG=1`
 ifeq ($(DEBUG),1)
 RGBASMFLAGS += -E
@@ -67,6 +94,11 @@ endif
 $(pokered_obj):        RGBASMFLAGS += -D _RED
 $(pokeblue_obj):       RGBASMFLAGS += -D _BLUE
 $(pokeblue_debug_obj): RGBASMFLAGS += -D _BLUE -D _DEBUG
+$(pokered_vc_obj):     RGBASMFLAGS += -D _RED -D _RED_VC
+$(pokeblue_vc_obj):    RGBASMFLAGS += -D _BLUE -D _BLUE_VC
+
+%.patch: vc/%.constants.sym %_vc.gbc %.gbc vc/%.patch.template
+	tools/make_patch $*_vc.sym $^ $@
 
 rgbdscheck.o: rgbdscheck.asm
 	$(RGBASM) -o $@ $<
@@ -89,6 +121,12 @@ $(info $(shell $(MAKE) -C tools))
 $(foreach obj, $(pokered_obj), $(eval $(call DEP,$(obj),$(obj:_red.o=.asm))))
 $(foreach obj, $(pokeblue_obj), $(eval $(call DEP,$(obj),$(obj:_blue.o=.asm))))
 $(foreach obj, $(pokeblue_debug_obj), $(eval $(call DEP,$(obj),$(obj:_blue_debug.o=.asm))))
+$(foreach obj, $(pokered_vc_obj), $(eval $(call DEP,$(obj),$(obj:_red_vc.o=.asm))))
+$(foreach obj, $(pokeblue_vc_obj), $(eval $(call DEP,$(obj),$(obj:_blue_vc.o=.asm))))
+
+# Dependencies for VC files that need to run scan_includes
+%.constants.sym: %.constants.asm $(shell tools/scan_includes %.constants.asm) | rgbdscheck.o
+	$(RGBASM) $< > $@
 
 endif
 
@@ -98,11 +136,15 @@ endif
 
 pokered_pad        = 0x00
 pokeblue_pad       = 0x00
+pokered_vc_pad     = 0x00
+pokeblue_vc_pad    = 0x00
 pokeblue_debug_pad = 0xff
 
 pokered_opt        = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON RED"
 pokeblue_opt       = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE"
 pokeblue_debug_opt = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE"
+pokered_vc_opt     = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON RED"
+pokeblue_vc_opt    = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE"
 
 %.gbc: $$(%_obj) layout.link
 	$(RGBLINK) -p $($*_pad) -d -m $*.map -n $*.sym -l layout.link -o $@ $(filter %.o,$^)

diff --git a/README.md b/README.md
@@ -7,14 +7,16 @@ It builds the following ROMs:
 - Pokemon Red (UE) [S][!].gb `sha1: ea9bcae617fdf159b045185467ae58b2e4a48b9a`
 - Pokemon Blue (UE) [S][!].gb `sha1: d7037c83e1ae5b39bde3c30787637ba1d4c48ce2`
 - BLUEMONS.GB (debug build) `sha1: 5b1456177671b79b263c614ea0e7cc9ac542e9c4`
+- dmgapae0.e69.patch `sha1: 0fb5f743696adfe1dbb2e062111f08f9bc5a293a`
+- dmgapee0.e68.patch `sha1: ed4be94dc29c64271942c87f2157bca9ca1019c7`
 
 To set up the repository, see [**INSTALL.md**](INSTALL.md).
 
 
 ## See also
 
 - **Discord:** [pret][discord]
-- **IRC:** [freenode#pret][irc]
+- **IRC:** [libera#pret][irc]
 
 Other disassembly projects:
 
@@ -36,6 +38,6 @@ Other disassembly projects:
 [pokefirered]: https://github.com/pret/pokefirered
 [pokeemerald]: https://github.com/pret/pokeemerald
 [discord]: https://discord.gg/d5dubZ3
-[irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
+[irc]: https://web.libera.chat/?#pret
 [ci]: https://github.com/pret/pokered/actions
 [ci-badge]: https://github.com/pret/pokered/actions/workflows/main.yml/badge.svg
diff --git a/audio/wave_instruments.asm b/audio/wave_instruments.asm
@@ -15,19 +15,19 @@
 ; the graph of the wave
 ; the current instrument is copied to rWave_0--rWave_f
 .wave0
-	db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11
+	dn  0,  2,  4,  6,  8, 10, 12, 14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 11, 10,  9,  8,  7,  6,  5,  4,  4,  3,  3,  2,  2,  1,  1
 
 .wave1
-	db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11
+	dn  0,  2,  4,  6,  8, 10, 12, 14, 14, 15, 15, 15, 15, 14, 14, 14, 13, 13, 12, 11, 10,  9,  8,  7,  6,  5,  4,  3,  2,  2,  1,  1
 
 .wave2
-	db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31
+	dn  1,  3,  6,  9, 11, 13, 14, 14, 14, 14, 15, 15, 15, 15, 14, 13, 13, 14, 15, 15, 15, 15, 14, 14, 14, 14, 13, 11,  9,  6,  3,  1
 
 .wave3
-	db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10
+	dn  0,  2,  4,  6,  8, 10, 12, 13, 14, 15, 15, 14, 13, 14, 15, 15, 14, 14, 13, 12, 11, 10,  9,  8,  7,  6,  5,  4,  3,  2,  1,  0
 
 .wave4
-	db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10
+	dn  0,  1,  2,  3,  4,  5,  6,  7,  8, 10, 12, 13, 14, 14, 15,  7,  7, 15, 14, 14, 13, 12, 10,  8,  7,  6,  5,  4,  3,  2,  1,  0
 
 ; duty 5 reads from sfx data
 .wave5
diff --git a/constants/item_constants.asm b/constants/item_constants.asm
@@ -122,7 +122,7 @@ __tmhm_value__ = NUM_TMS + 1
 
 add_tmnum: MACRO
 \1_TMNUM EQU __tmhm_value__
-__tmhm_value__ = __tmhm_value__ + 1
+__tmhm_value__ += 1
 ENDM
 
 add_hm: MACRO

diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
@@ -7,3 +7,12 @@ TRUE  EQU 1
 	const FLAG_RESET ; 0
 	const FLAG_SET   ; 1
 	const FLAG_TEST  ; 2
+
+; wOptions
+TEXT_DELAY_FAST    EQU %001 ; 1
+TEXT_DELAY_MEDIUM  EQU %011 ; 3
+TEXT_DELAY_SLOW    EQU %101 ; 5
+
+	const_def 6
+	const BIT_BATTLE_SHIFT     ; 6
+	const BIT_BATTLE_ANIMATION ; 7
diff --git a/data/maps/objects/AgathasRoom.asm b/data/maps/objects/AgathasRoom.asm
@@ -1,15 +1,15 @@
 AgathasRoom_Object:
 	db $0 ; border block
 
-	def_warps
-	warp  4, 11, 2, BRUNOS_ROOM
-	warp  5, 11, 3, BRUNOS_ROOM
-	warp  4,  0, 0, LANCES_ROOM
-	warp  5,  0, 0, LANCES_ROOM
+	def_warp_events
+	warp_event  4, 11, BRUNOS_ROOM, 3
+	warp_event  5, 11, BRUNOS_ROOM, 4
+	warp_event  4,  0, LANCES_ROOM, 1
+	warp_event  5,  0, LANCES_ROOM, 1
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_AGATHA, 5, 2, STAY, DOWN, 1, OPP_AGATHA, 1
+	def_object_events
+	object_event  5,  2, SPRITE_AGATHA, STAY, DOWN, 1, OPP_AGATHA, 1
 
 	def_warps_to AGATHAS_ROOM
diff --git a/data/maps/objects/BikeShop.asm b/data/maps/objects/BikeShop.asm
@@ -1,15 +1,15 @@
 BikeShop_Object:
 	db $e ; border block
 
-	def_warps
-	warp  2,  7, 4, LAST_MAP
-	warp  3,  7, 4, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 5
+	warp_event  3,  7, LAST_MAP, 5
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_BIKE_SHOP_CLERK, 6, 2, STAY, NONE, 1 ; person
-	object SPRITE_MIDDLE_AGED_WOMAN, 5, 6, WALK, UP_DOWN, 2 ; person
-	object SPRITE_YOUNGSTER, 1, 3, STAY, UP, 3 ; person
+	def_object_events
+	object_event  6,  2, SPRITE_BIKE_SHOP_CLERK, STAY, NONE, 1 ; person
+	object_event  5,  6, SPRITE_MIDDLE_AGED_WOMAN, WALK, UP_DOWN, 2 ; person
+	object_event  1,  3, SPRITE_YOUNGSTER, STAY, UP, 3 ; person
 
 	def_warps_to BIKE_SHOP
diff --git a/data/maps/objects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm
@@ -1,15 +1,15 @@
 BillsHouse_Object:
 	db $d ; border block
 
-	def_warps
-	warp  2,  7, 0, LAST_MAP
-	warp  3,  7, 0, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 1
+	warp_event  3,  7, LAST_MAP, 1
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_MONSTER, 6, 5, STAY, NONE, 1 ; person
-	object SPRITE_SUPER_NERD, 4, 4, STAY, NONE, 2 ; person
-	object SPRITE_SUPER_NERD, 6, 5, STAY, NONE, 3 ; person
+	def_object_events
+	object_event  6,  5, SPRITE_MONSTER, STAY, NONE, 1 ; person
+	object_event  4,  4, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person
+	object_event  6,  5, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
 
 	def_warps_to BILLS_HOUSE
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ @@
     # compiled roms
     *.gbc
     *.gb
+    *.patch
     # rgbds extras
     *.map
@@ Expand Down @@