From 6684276bf6eb00a0edd2bba812d527c93c517ae1 Mon Sep 17 00:00:00 2001 From: DrippingYellow Date: Sun, 15 Dec 2024 13:17:59 -0600 Subject: [PATCH 01/10] Sporadic constantifying and function naming --- .DS_Store | Bin 0 -> 10244 bytes Makefile | 1 + constants.asm | 3 + constants/flypoint_constants.asm | 25 ++++++ constants/spawnpoint_constants.asm | 49 ++++++++++++ data/.DS_Store | Bin 0 -> 8196 bytes data/maps/flypoints.asm | 27 +++++++ data/maps/landmarks.asm | 60 +++++++++++++- data/maps/spawn_points.asm | 72 +++++++++++++++++ engine/.DS_Store | Bin 0 -> 8196 bytes engine/debug/field/follow_npc_test.inc | 4 +- engine/debug/field/map_viewer.inc | 4 +- engine/debug/field/mon_following.inc | 4 +- engine/debug/field/sprite_viewer.inc | 4 +- engine/dumps/bank02.asm | 104 ++++++------------------ engine/dumps/bank03.asm | 105 +------------------------ engine/dumps/bank09.asm | 4 +- engine/dumps/bank0d.asm | 60 ++++---------- engine/dumps/bank0f.asm | 12 +-- engine/games/picross_minigame.asm | 4 +- engine/landmarks.asm | 99 ++++++++++++----------- engine/menu/main_menu.asm | 6 +- engine/menu/start_menu.asm | 2 +- engine/movie/oak_speech.asm | 6 +- gfx/.DS_Store | Bin 0 -> 10244 bytes gfx/pokemon/.DS_Store | Bin 0 -> 47108 bytes home/map.asm | 3 +- home/map_objects.asm | 2 +- layout.link | 11 ++- ram/wram.asm | 21 +++-- scripts/OldCityPokecenter2F.asm | 4 +- 31 files changed, 383 insertions(+), 313 deletions(-) create mode 100644 .DS_Store create mode 100644 constants/flypoint_constants.asm create mode 100644 constants/spawnpoint_constants.asm create mode 100644 data/.DS_Store create mode 100644 data/maps/flypoints.asm create mode 100644 data/maps/spawn_points.asm create mode 100644 engine/.DS_Store create mode 100644 gfx/.DS_Store create mode 100644 gfx/pokemon/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..208ee215cd90779e4dd41f884fef2ccd3304b053 GIT binary patch literal 10244 zcmeHMPly|36n~RUc4xb54Oq46Wx$JK)=k{Dp%x@fcP~Xjjp#vZ%xu!#xXDb&B#jal zA}V4<=*0>iw08wX#XpAyLFmmtr}m<<7d;4yCqa?o`~FPwUNTwNLv;_|2QzQ-z4zw# zo8LF@oB1XHU=_R79DoY|4sODx7jPHTgkNkEEuniJL~CI_G}d#awV>IWh%_BW0i%FX zz$jo8FbeD!1@M_InlrDg*&79n0!D$M0%Cq}aTB(n?Lb*Mb>L1e0npmmEgK%E#Q|DZ z+k&40mP*HdSH~5!9Vn~P!P1KlOCwu)gM@@-&QR_Sbn z3meb{kD){A5T1Q3f^z6*KKfpBn1~uNnI6UXs7WUU735JxB?87Jd7zD4h?nx%{_x|7 z2a6bSh>u|SY7$FC-QhmOaegwpN(V!wawB}q31j?&&elF|oT-cB|S zT}4ojNQ+0su#-`pf9nMGQG!3;_QGFU&tWd573XJU?!F+znt>WBD5}bb8pB?=^v$@R z;y-_W5aF|PP!7{#7>^r25ImB|;VeAo^}?2}-cP+&qaJp$*(+8eX{Tmp9mkn>&XhKS zUa3>*bi-n${iOKy7>>Ia9ap@^>$P4vedtu+cPe$i)|LtNY7Il4dZO-EgI+P{`qfb8 zmXyPpo0}`AZ|(PU*<%?ue`G7;_K)9}&A3OFk8N$uIXBz+cB6bxUnv znKYpm-De`y#yL!OGIEJ`KA}EJZ|3QHMsujnr3B;rjH10GaA%N61?#qr=&V|qgOP%@ ztK*53SUI1Gh_Q1}a?@fMLHJD&v?ak7gq*|auc(jWA5G^Y{9!J|j`K6zg9U+m6SPp0 zO)SH8v^b^0B2H{ADOL@7*w+@lq%c1F&kN&lzrVPg%ecAh(OoJ--1*q1R>o`S+~d{q zG1&fM@0oOj&Yu4BTm9(WBQ71kf1k}p*OJrP9&yJiH;H3jfhJcW{2W!#9(t7*?jPQV zL+|LJI_YIB;S!z{UtdC5nsvPI@L|eu6Su!T8A0(Ee>@r0!Pt4In$x2gpMyJsPYU@o zWCd(8F5un4y_84(jbg-u $@ diff --git a/constants.asm b/constants.asm index b3a63657..62342016 100644 --- a/constants.asm +++ b/constants.asm @@ -58,3 +58,6 @@ INCLUDE "constants/sgb_constants.asm" INCLUDE "constants/map_object_constants.asm" INCLUDE "constants/start_menu_constants.asm" INCLUDE "constants/movement_constants.asm" + +INCLUDE "constants/flypoint_constants.asm" +INCLUDE "constants/spawnpoint_constants.asm" diff --git a/constants/flypoint_constants.asm b/constants/flypoint_constants.asm new file mode 100644 index 00000000..dadfe6fb --- /dev/null +++ b/constants/flypoint_constants.asm @@ -0,0 +1,25 @@ +; Fly point indexes (see data/flypoint) + const_def + + const FLY_POINT_SILENT_HILL ; 0 + const FLY_POINT_OLD ; 1 + const FLY_POINT_WEST ; 2 + const FLY_POINT_HAITEKU ; 3 + const FLY_POINT_FONTO ; 4 + const FLY_POINT_BAADON ; 5 + const FLY_POINT_NEWTYPE ; 6 + const FLY_POINT_SUGAR ; 7 + const FLY_POINT_BULL_FOREST ; 8 + const FLY_POINT_STAND ; 9 + const FLY_POINT_KANTO ; 10 + const FLY_POINT_PRINCE ; 11 + const FLY_POINT_MT_FUJI ; 12 + const FLY_POINT_SOUTH ; 13 + const FLY_POINT_NORTH ; 14 + +; Unused? + + const FLY_POINT_ROUTE_15 ; 15 + const FLY_POINT_ROUTE_18 ; 16 + +DEF FLY_POINT_N_A EQU $FF diff --git a/constants/spawnpoint_constants.asm b/constants/spawnpoint_constants.asm new file mode 100644 index 00000000..7039b73e --- /dev/null +++ b/constants/spawnpoint_constants.asm @@ -0,0 +1,49 @@ +; Spawn point indexes (see data/maps/landmarks.asm) + const_def + + const SPAWN_POINT_NONE + const SPAWN_POINT_SILENT + const SPAWN_POINT_OLD + const SPAWN_POINT_WEST + const SPAWN_POINT_HIGH_TECH + const SPAWN_POINT_FOUNT + const SPAWN_POINT_BIRDON + const SPAWN_POINT_NEW_TYPE + const SPAWN_POINT_SUGAR + const SPAWN_POINT_BLUE_FOREST + const SPAWN_POINT_STAND + const SPAWN_POINT_KANTO + const SPAWN_POINT_PRINCE + const SPAWN_POINT_MT_FUJI + const SPAWN_POINT_SOUTH + const SPAWN_POINT_NORTH + const SPAWN_POINT_ROUTE_15 + const SPAWN_POINT_ROUTE_18 + const SPAWN_POINT_POWER_PLANT_1 + const SPAWN_POINT_POWER_PLANT_2 + const SPAWN_POINT_POWER_PLANT_3 + const SPAWN_POINT_POWER_PLANT_4 + const SPAWN_POINT_RUINS_1 + const SPAWN_POINT_RUINS_2 + const SPAWN_POINT_MINES_1 + const SPAWN_POINT_MINES_2 + const SPAWN_POINT_MINES_3 + const SPAWN_POINT_MINES_4 + const SPAWN_POINT_MINES_5 + const SPAWN_POINT_MINES_6 + const SPAWN_POINT_MINES_7 + const SPAWN_POINT_HIDEOUT_1 + const SPAWN_POINT_HIDEOUT_2 + const SPAWN_POINT_HIDEOUT_3 + const SPAWN_POINT_SLOWPOKE_WELL_1 + const SPAWN_POINT_SLOWPOKE_WELL_2 + const SPAWN_POINT_POKEMON_LEAGUE_1 + const SPAWN_POINT_POKEMON_LEAGUE_1_2 + const SPAWN_POINT_POKEMON_LEAGUE_2 + const SPAWN_POINT_POKEMON_LEAGUE_3 + const SPAWN_POINT_POKEMON_LEAGUE_4 + const SPAWN_POINT_POKEMON_LEAGUE_5 + const SPAWN_POINT_POKEMON_LEAGUE_6 + const SPAWN_POINT_POKEMON_LEAGUE_7 + const SPAWN_POINT_POKEMON_LEAGUE_7_2 + const SPAWN_POINT_SILENT_HILL diff --git a/data/.DS_Store b/data/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..74ecd55a0065e4d8150c688d1ae01be7f139e495 GIT binary patch literal 8196 zcmeHMO=}cE5UtLRxFU!qhb$s82k|6G{=pd5yO3)Tce66C?qrr^BMBieprGQ#Q~rWi zPcfheFZwS$1VOxur(AsfvD4Kvvq5qYCDoz3mZ?|s-cy=S5 zAQ?E58PNMfjIM3sY+q)O3 zPW7<(EcZH^5g~tK`G+)tf{Zpp{+~yNzw~nc$E%E=Av}LGBH*{XSp?=DjVtVPudjo> z^l|Rq_QBz+=VmUL-!nJ)1KvyT>~m*W7fC}+UUPc3!8^omfO$usRA!&_ zqQ_}n!EhbBd*7$IZ@_syC*cBJtzyc#fp5Z))}d>os%!Va=?XAh*TRQDR|V&ForDW? zk)C|)PZQd~TCILh=-OWBnk{3jVuQFo=g46&}ZuF2N5c8vZ2T{n#@tTiDRG(=xF